From patchwork Tue Mar 7 14:38:18 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: 659746 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp2425457wrb; Tue, 7 Mar 2023 06:38:55 -0800 (PST) X-Google-Smtp-Source: AK7set85jXJjY+7XoznL9SP4iySdk8MDhMs2Iid0C95N6MsiBia/6+nbuiOYyQ8kDtNO3DFkP1PQ X-Received: by 2002:a05:6214:493:b0:56e:9986:4fa9 with SMTP id pt19-20020a056214049300b0056e99864fa9mr28832591qvb.7.1678199935111; Tue, 07 Mar 2023 06:38:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678199935; cv=none; d=google.com; s=arc-20160816; b=wzUE56Q67DAh+/dvDmj1Y+paHBv7QzYm9py6LnsOoePvTbHZ/bvXs8Cp2uV29NoLxf 72psz2Cvn+TKw20OQsX5x7MiHcIdysAFT12W5HdLtp7GrOHhgui3qdneE0Q4JiuoA4gg MI5iA95e2hgiSABqajQXxSjrCtZ4WRJrAiOfaWHbGwD2QpkoRnSxJfEjnvWHQLRH7ajn VATAiaS8RzQlG07/zapdZb6GQ/muco+iE/aHda12hkltfdUSXfsZjTwe6oGEb5t83Kua GsRE6hXobOlJIAP129O4XqEkzpXvK7xxskvsIMvamufDkvln3NjPVtDKE02Yvv06glrT P17Q== 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=JhWB12RXhqbdBnTxd0mWlLQN6xXUPCeseE4ELOjCgi5onHSutPgDnkSnNKmaLYREFT jGDWgfc5kOu14w0xxN+fVHw83BlEJGSO12E/0IPK1Mlb5Wr7AWgLZV31ihfc/VQvRBdu Fg/oE8ACETKaS7hAStQHHeumpIs2iB2zTm9J9DW+FrPRdjcpsLU3kHP+Xb29laBqfD5t /WRKR1yl6PsrD9OeV+74rC/SAfjVzB5Hb/VfOO+2xwQaIhmXPDaUOq7jCBxcUOcl8OZD R7bQBXQR7VdzjT9Qp1paWd2fs547iy4jFRcid/AH9X7xm8+xOwfJsIWvKfrOGvQ4gQLk 4DBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LET7CW6W; 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 124-20020a370b82000000b007140bf2008csi9089344qkl.648.2023.03.07.06.38.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Mar 2023 06:38:55 -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=LET7CW6W; 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 1pZYSd-0005My-7K; Tue, 07 Mar 2023 09:38:39 -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 1pZYSP-0005I4-3I for qemu-devel@nongnu.org; Tue, 07 Mar 2023 09:38:26 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZYSN-0000b0-4u for qemu-devel@nongnu.org; Tue, 07 Mar 2023 09:38:24 -0500 Received: by mail-wm1-x32c.google.com with SMTP id j3so7919753wms.2 for ; Tue, 07 Mar 2023 06:38:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678199901; 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=LET7CW6WFv+Idt2XMiFypY91WMZuGAt3LJcub7aJRuzpzMAyuVMPZSIkLCYl+Tghlq Dk5beV6yFKjRF++GT/jTNNUdMJeA0GfeGL7zxYbpXUI6QfoZsW/L2iHEpFIfX9YT4ed4 koyw7TJFIvTb5Utni339PdcJyHwmLUNCrB9GW87MK1jM5ctiFpkAo1qS/lm56iV+LkzU o255UiUCHftBy9OnEsGouYxUj7W24PFvCa5BSdn5L7W5053vYEycVozmKwHTpMICS2sF LuSTmY9gyl3Z50k9k6rybRCDzLW2fdu+2xD8l/fJmlZbMNjJqi310zgsncaTFohQA0/t Vnew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678199901; 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=ehHGiCOgEREiqAVEMT87Hzvv4vEwOPvf88Y7285PzateZ2SA5PHTF8hhV45g3e7Cvr OfpxwNTLxXk+N63lTyjVAxfE/Wzqhvnz1XUl5rq2ZsI4lIR9ZhQCRuLNiKWNpWUrxg68 pIKNqvSPg+Y7+by3DSKXNcVD97RQr7AQ/D/2PWDOYGzvtGEgv1P7Sb+QBKBTtrf9+EGr 23OGw7CXM8wOw0oLsGJDzPhyBxEkHGgxx+PEqeiEAtnMx1WCjMA5hwU6EIyu1u7VcEut kRFiZNQAUrEhvoCxIzSrqobhlfhoDjZs2Ec44LYf0edffV5dnuxpklVcbNDUH6ClyaVp xHyA== X-Gm-Message-State: AO0yUKWMOz7C4QtdJkwp0sqGF8aqj4gRmPL4aLeaB81bhlUJM5cQS2fk z21k+xFSpFQURH7do8hDzBcQaw== X-Received: by 2002:a05:600c:4f88:b0:3eb:3908:8541 with SMTP id n8-20020a05600c4f8800b003eb39088541mr13241733wmq.2.1678199901459; Tue, 07 Mar 2023 06:38:21 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j17-20020adff011000000b002c5a1bd527dsm12641750wro.96.2023.03.07.06.38.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 06:38:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C48CA1FFBC; Tue, 7 Mar 2023 14:38:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , Thomas Huth , Wainer dos Santos Moschetta , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Markus Armbruster , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Stefan Hajnoczi , Bastian Koppelmann , Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Beraldo Leal Subject: [PATCH 4/5] scripts/ci: update gitlab-runner playbook to handle CentOS Date: Tue, 7 Mar 2023 14:38:18 +0000 Message-Id: <20230307143819.510186-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307143819.510186-1-alex.bennee@linaro.org> References: <20230307143819.510186-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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\"] }})'"