From patchwork Wed Mar 15 17:43:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 663364 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp1713763wrv; Wed, 15 Mar 2023 10:44:48 -0700 (PDT) X-Google-Smtp-Source: AK7set/9UCmeil7ps6ItPgX8BfuEkIPr3FoWBUI3Ud9seZsZJDNMy/bENU1tcq/MG1P7zJ1kj+kP X-Received: by 2002:ad4:5c6f:0:b0:56e:a88f:70ef with SMTP id i15-20020ad45c6f000000b0056ea88f70efmr30318245qvh.23.1678902288267; Wed, 15 Mar 2023 10:44:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678902288; cv=none; d=google.com; s=arc-20160816; b=Ahbo8VbchgzGJ/665lbNoNQgzFr+T+QPfck/XeHBXhWAWPE9QwPsk58ti2VtmmHeq7 PXaehlZ4eo/pILyxipgsZfcjNy5uo7LYp2JiIr20f8dMvb0Bp7YYVNHFncw683QD4M5Q yeh0U06I7QVh484Hs8z/H9VKuiGUnnyD0nNB6S9X1xZGtjz5wkZeM377BoifYyd7bWhV YJ/GuEA1ukJXUfTlR8ncewYDg7nV1AcYIOxjtjjKQdTA+nStLTIUG1NlIvFeKPba+GGP 2PdNZsRO/E7dEvzNsAROoXTGd82UQVjQi89M49G1O1qAgpT+ocxQq/qSVDpIC1aRK9gD FD7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6cCbPXzWfjZFi2jKGovhuePGEghRzJegWJl5AEsiLWo=; b=RqiGFg2gHo9QQbPXvXKWATIXqj2sidbbFyE41ye8HqFuTLlt+pCgjB+251BMDLnneU 5V5NK7RrgOeejB5VKlRaTsluxhmJDpjp83CpxIap3lzryV5at4sVydc5/WS1NAWnWmaL lc234ubZO0KuedBZ9JEQ6yWc9rszVBIy3HsCUMEZLzaHumVD+ErmxP+EYYAD23A/TJLu aPbie8UujjiYjbu317DTsbUxjmMVTrha3yN3MehZ1pJqwXOc29B5eJ3MrJ3VJB1S1Luj zFEdotJsi8j9okDWPHP5nY1PUuTVss2hwtqU6rqe5LInvt+3tOLVvaX91qRxetRbz0aM 5fDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e6frw5ss; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r1-20020a0c8d01000000b005acd67a4515si3719857qvb.151.2023.03.15.10.44.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Mar 2023 10:44:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e6frw5ss; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcVA9-00022L-Jz; Wed, 15 Mar 2023 13:43:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcVA7-000200-Ne for qemu-devel@nongnu.org; Wed, 15 Mar 2023 13:43:43 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcVA0-0000c0-Bd for qemu-devel@nongnu.org; Wed, 15 Mar 2023 13:43:43 -0400 Received: by mail-wm1-x330.google.com with SMTP id bi20so3207187wmb.2 for ; Wed, 15 Mar 2023 10:43:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678902213; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6cCbPXzWfjZFi2jKGovhuePGEghRzJegWJl5AEsiLWo=; b=e6frw5ss4POBsTvVuRn1RoJ1D1MFlJUoM+dG8WV65R1WDlJ6YIwdPIK41ldiQC0A7N YJX4Wl+4jx/IALzWdtfbzmAV7s4LrySlL62iLsXR84XfLBCUEgeYqBtjB3XqzU8WdPwD kDZe37PhbVn2DJZeJdXjQC4t50rQbPlF+HOPN3WdcKSyNCtFIWnbH0Za0AA8r02NUMy9 I/u6b5301gInJ0YqiezsVGaoksbvbrKgNoWBOUXtBTpODia4MKZ6MG10qoJuJna/L2eJ x+9PfEFzvjfJX2y5zNWxOuIWppPblyB3YMRtx8MK2cqMJ5N9gOIqbbImeZ/r6dUcmANK MR6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678902213; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6cCbPXzWfjZFi2jKGovhuePGEghRzJegWJl5AEsiLWo=; b=zG+W2iSwjyxCl+7Yhg0E/8py+NDpZE8vGD0/FeKzlj6YEUm4bH9Fv5V7HJx3X2ulD5 ptHvO17dOaVv5WC0lWEoiSB7++bLEOZKNrOPcp1+kaZFod7E/f/L6OLeHjqOfT3wbOaj c/c9RVeVDhy5QMZftph57KFmAwaUvkX/U1cBKgy7vSer8fLVSZmxXZ+ihTsBHG79Upjs +XvUfHKV3e6xjsc+zULBg/t768LTWvAJUkpsPK98P4XpC6zffJOx8alEA1bSIiYX9kVr 0Rl+f0MlvF+qS5oUmDCP2MXM+SRYg+XmjHTXWSB0RYue6opHerzDoP2/v2NpfMKCVhK8 p+XQ== X-Gm-Message-State: AO0yUKV5GAUREfHCO4nFIorWtpYm7PhuQqdIUR6Sht8N9eQ8tr/sAAZL vZT7c+JCJMpWmiYPncYoCKZ1ZQ== X-Received: by 2002:a05:600c:450d:b0:3ea:fca4:8c48 with SMTP id t13-20020a05600c450d00b003eafca48c48mr18220315wmo.23.1678902213685; Wed, 15 Mar 2023 10:43:33 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p9-20020a1c5449000000b003dc1d668866sm2529134wmi.10.2023.03.15.10.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 10:43:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A873D1FFBC; Wed, 15 Mar 2023 17:43:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , =?utf-8?q?Marc-Andr=C3=A9_Lurea?= =?utf-8?q?u?= , qemu-riscv@nongnu.org, Riku Voipio , Igor Mammedov , Xiao Guangrong , Thomas Huth , Wainer dos Santos Moschetta , "Dr. David Alan Gilbert" , Alex Williamson , Hao Wu , Cleber Rosa , Daniel Henrique Barboza , Jan Kiszka , Aurelien Jarno , qemu-arm@nongnu.org, Marcelo Tosatti , Eduardo Habkost , Alexandre Iooss , Gerd Hoffmann , Palmer Dabbelt , Ilya Leoshkevich , qemu-ppc@nongnu.org, Juan Quintela , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Darren Kenny , kvm@vger.kernel.org, Marcel Apfelbaum , Peter Maydell , Richard Henderson , Stafford Horne , Weiwei Li , Sunil V L , Stefan Hajnoczi , Thomas Huth , Vijai Kumar K , Liu Zhiwei , David Gibson , Song Gao , Paolo Bonzini , "Michael S. Tsirkin" , Niek Linnenbank , Greg Kurz , Laurent Vivier , Qiuhao Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Xiaojuan Yang , Mahmoud Mandour , Alexander Bulekov , Jiaxun Yang , qemu-block@nongnu.org, Yanan Wang , David Woodhouse , qemu-s390x@nongnu.org, Strahinja Jankovic , Bandan Das , Alistair Francis , Aleksandar Rikalo , Tyrone Ting , Kevin Wolf , David Hildenbrand , Beraldo Leal , Beniamino Galvani , Paul Durrant , Bin Meng , Sunil Muthuswamy , Hanna Reitz , Peter Xu , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PATCH v2 04/32] scripts/ci: update gitlab-runner playbook to handle CentOS Date: Wed, 15 Mar 2023 17:43:03 +0000 Message-Id: <20230315174331.2959-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315174331.2959-1-alex.bennee@linaro.org> References: <20230315174331.2959-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This was broken when we moved to using the pre-built packages as we didn't take care to ensure we used RPMs where required. NB: I could never get this to complete on my test setup but I suspect this was down to network connectivity and timeouts while downloading. Fixes: 69c4befba1 (scripts/ci: update gitlab-runner playbook to use latest runner) Signed-off-by: Alex Bennée --- scripts/ci/setup/gitlab-runner.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml index 95d4199c03..1a1b270ff2 100644 --- a/scripts/ci/setup/gitlab-runner.yml +++ b/scripts/ci/setup/gitlab-runner.yml @@ -48,13 +48,29 @@ - debug: msg: gitlab-runner arch is {{ gitlab_runner_arch }} - - name: Download the matching gitlab-runner + - name: Download the matching gitlab-runner (DEB) get_url: dest: "/root/" url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_{{ gitlab_runner_arch }}.deb" + when: + - ansible_facts['distribution'] == 'Ubuntu' + + - name: Download the matching gitlab-runner (RPM) + get_url: + dest: "/root/" + url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/rpm/gitlab-runner_{{ gitlab_runner_arch }}.rpm" + when: + - ansible_facts['distribution'] == 'CentOS' - - name: Install gitlab-runner via package manager + - name: Install gitlab-runner via package manager (DEB) apt: deb="/root/gitlab-runner_{{ gitlab_runner_arch }}.deb" + when: + - ansible_facts['distribution'] == 'Ubuntu' + + - name: Install gitlab-runner via package manager (RPM) + yum: name="/root/gitlab-runner_{{ gitlab_runner_arch }}.rpm" + when: + - ansible_facts['distribution'] == 'CentOS' - name: Register the gitlab-runner command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'"