From patchwork Fri Mar 10 10:31:16 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: 661614 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp770970wrb; Fri, 10 Mar 2023 02:32:10 -0800 (PST) X-Google-Smtp-Source: AK7set9AhD1mEG43g2Ev1fC9RgWNUvXrAJRMdhZZTwcJl/kSIAnm+kWz9qa2pUyRpn5qWATCzokL X-Received: by 2002:a05:622a:1394:b0:3c0:40c1:f24a with SMTP id o20-20020a05622a139400b003c040c1f24amr16623952qtk.34.1678444330503; Fri, 10 Mar 2023 02:32:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678444330; cv=none; d=google.com; s=arc-20160816; b=Xfo07UNXLcEP/+RjikqtxKM8oaoHiiFzqYxmgtEpUuji+oVmNrusZIFsiU2ZA8UcQY pFo2CNPs7RSRobOo0F4uiMsQ3a3+Fop9gX8f1TJztJ/GI+3rtBw820vQ4n+ltoCxGKjB 6hf8mXMvujbnojewjnaJ0XhYQp3WddUqhDAfx2Q1Uhs3q3WjyalN2qpsXA8WqShXIVYq HFlocRToFwYy3+Efs6e9m8tAXuI501JZkcPJvqvICFqkfkl3579pYYsJFIZI9PJ4PDyq 7ruwNJ4zAB5dB+8a9YV2AHAl29j72OmFwgIV3BJSOxL57Cmi670NFMw7bax8MwSI98X1 W5Fg== 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=t5r6n1SPzBisdpo/yribKT7FoTVTUEpjC68DMNlFwnWOQQ7XoC63wyX+WziygxSACk rFZDeMzlMJixT4FNq7DtDEajh9ahpLU2kLPROdukzhLcK6V7ix098yV4ngfnR6VfqxxL haHZrH+jhjsVlEE00FH3OV6m4qlfhvzvYVOrw3NgrxA7el9A5oQVUYvTjRtJXJMu0J9K krXNWE/O3QaSTMZq+HYIIo5Vs6tkWGR8LrGdi2+Bd1Ci16eDugQX8cc9HNuyRNQd7N1y v2+8Q7bUMHmKkH7Z8rEqse3Q95p+BfvVnQxebleMSRiCnv9+bJGuyccRso7bp62DwLOi sVBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="FE/crdNH"; 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 f20-20020ac859d4000000b003b9a6b42959si1187048qtf.268.2023.03.10.02.32.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2023 02:32:10 -0800 (PST) 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="FE/crdNH"; 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 1paa2B-0007dz-OO; Fri, 10 Mar 2023 05:31:35 -0500 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 1paa25-0007UL-K1 for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:29 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paa22-0004Fo-Sj for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:29 -0500 Received: by mail-wr1-x429.google.com with SMTP id f11so4565134wrv.8 for ; Fri, 10 Mar 2023 02:31:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444285; 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=FE/crdNH/S0XkLgeFBbHk628l7rnVEcYaKcHhMWXhWGt9MB+nqBHrxZtXE5ftv91pb TussFRCZbF8KuOoAzGxx5Mk9j18j9l2IjjuI8S+DgxvYlRnK7eU7zft1M3AnR08ncheO p7DEEwKohW2gGOROT79x6DaTV6jVNMki4RuBA25PSr/mOzHXoa4YBU48idMWNBKeRFsa fnz0CUzyRqPnX3XtZ7Dzgl2L/cdl4gXCi6nN+xReykbIr4c+n/dZCyeXqEOA+4W8rAGv EAE6X6bE0xK5OPJ+88vKEQujN01EMsdVH24NSKpx8afdi65bqOnUHTDp4pKwNijrK8Ea HUiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444285; 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=buON81KcpNf0t8F22IuxGj1je+jWmAVDUJUFodpOlpVTH8ftjAUenigSp8s53KFNo2 GRwYd5ekbO73yHBZXIaFiHNe7npUm/XUvIy+1SWDvmj7/V7Z+mJn1iQ5UZ9ms7j3WdHB 3/yn5khYkDyKyn0g7roysOp5BCQa9JtUkigYXtWOglq6ZKPyJsDr0wWLF3PutKnGNInK Dt+Nn9C8WR7Uok2emJ0nF8IXz+0gDVofRlfZgXGJKEn24uPK0ezU3CCeuOtpr95J1OKC CsB2MQ1qiMonx7bJIsqMiMMPHIh2A7hIbGItRxUz6c+/P4ybrh6QIBCe8R9M6VcqR7UE rn0w== X-Gm-Message-State: AO0yUKUSFc058xVgirQlBrcoLlKy2eZE7ddOUy5GJX5eNaT5ACyp8db0 eL1XMNZKLq1UjPXzWIpgWuBRtw== X-Received: by 2002:a5d:526a:0:b0:2c7:1210:fe5b with SMTP id l10-20020a5d526a000000b002c71210fe5bmr17110053wrc.49.1678444285572; Fri, 10 Mar 2023 02:31:25 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d7-20020adffd87000000b002c59e001631sm1845103wrr.77.2023.03.10.02.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E448E1FFBC; Fri, 10 Mar 2023 10:31:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal Subject: [PATCH 04/11] scripts/ci: update gitlab-runner playbook to handle CentOS Date: Fri, 10 Mar 2023 10:31:16 +0000 Message-Id: <20230310103123.2118519-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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=ham 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\"] }})'"