From nobody Sun Nov 24 09:10:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1725990118702883.0163173835731; Tue, 10 Sep 2024 10:41:58 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9840A19F0; Tue, 10 Sep 2024 13:41:57 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3D1081A0D; Tue, 10 Sep 2024 13:39:19 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E507D198C; Tue, 10 Sep 2024 13:39:12 -0400 (EDT) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2DF151909 for ; Tue, 10 Sep 2024 13:39:07 -0400 (EDT) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a8d2b4a5bf1so142601466b.2 for ; Tue, 10 Sep 2024 10:39:07 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d2592647esm508348266b.48.2024.09.10.10.39.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 10:39:04 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E07665F9CE; Tue, 10 Sep 2024 18:39:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725989946; x=1726594746; darn=lists.libvirt.org; 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=3rTxwacRyl+bWtsw8yvVr2/Byzv5V7eVXyx+MM0eORw=; b=e6u5fANSCFZHw3zoqoOj/qAg0gJF8xxOQKOfVYLkP3fF+kBgCbLDwjFP5nOxSa4Z5O EoIx9F/8g6oBkjkkEgQF3Q2xMoWgsiAMQnRtXpxGmxPrA1OfQ5ZFq1+qJHHpWw7uWE3c 2xOy7rDHQ2VzBrqR2yhL5VmXMKe37aCpoiR0YZRcifUYeQeGzRN24EZmcSn4o2F7c7HP uIDIHiASDLrWfrY6IcF5Wepb5D2RRO7cLETwGatAw0yt3m6Dk2IXgpN1914aPY1I63nE A1lnsfzo+t1BTKqJVqhYtP7V3S/HIGU4pkywmnwfpqJid9j7cDYL6c2tObv3ohPJiJja kojw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725989946; x=1726594746; 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=3rTxwacRyl+bWtsw8yvVr2/Byzv5V7eVXyx+MM0eORw=; b=WoalUhMcNMHV3nTodlBcI3zfHZ3bResZbZ0G7hD9xI/1nHfusthVCovVqDhnAtvuiI ouR2qi5jgM60pI9xO9p0qabBxXeS/J+IVbQmXAZDZ6HRdq/cm8F1MURd1vBs/TxKxn8o 1KQlqLFtSJCRwDFQfaBl/sldkwLEJEvh3mCF2P8rdsSG7fIbenL0WSHqvGtulXodgjRP O6O1Rqs1+jC1RUZClAhejjuozVdhTSlXTmASwVbDDObQ8Idn0ihrKyTgqXf/Hj1UZRKS bWrhx6UyAlrGm0Ej9i8AUQRJnNv9nVLD6Z2cHuQ5TGAtR3g3/dNv731cHMglXiEmStgH NaQg== X-Forwarded-Encrypted: i=1; AJvYcCXJBfe8oF7g8TwTAophnkyE0MvxkyhnEHMzSwczuq8t2n9OpnSWVgVGOHiNBeiTRiN1XW+1Qw==@lists.libvirt.org X-Gm-Message-State: AOJu0Yy8DBh6vEkdPOU9A2Lv73a1boUW46L3dDtWokTK4t9KAh+vR38A BBVCdDsexdbxmVhvWzTdPAlO4+/kgzUblM/lxkV33nIh2FQa4Oh+/7u/jYkz2jU= X-Google-Smtp-Source: AGHT+IE0k9TBw1KZtC5bnOYFS68MWn5Sz/qewV0BRe90PR3RY5lZ8Au07wLZwuup8S4m73snV6DoSQ== X-Received: by 2002:a17:907:7292:b0:a8d:2ab2:c990 with SMTP id a640c23a62f3a-a9004aba7ebmr28322066b.64.1725989945877; Tue, 10 Sep 2024 10:39:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/10] scripts/ci: update the gitlab-runner playbook Date: Tue, 10 Sep 2024 18:38:55 +0100 Message-Id: <20240910173900.4154726-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240910173900.4154726-1-alex.bennee@linaro.org> References: <20240910173900.4154726-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GQ2SCZJ2ZX4GVQYNB7IL4FEQ2BQ7WSXD X-Message-ID-Hash: GQ2SCZJ2ZX4GVQYNB7IL4FEQ2BQ7WSXD X-MailFrom: alex.bennee@linaro.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: Thomas Huth , Zhao Liu , Peter Maydell , Paolo Bonzini , Marcel Apfelbaum , qemu-arm@nongnu.org, devel@lists.libvirt.org, Pierrick Bouvier , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Beraldo Leal , Eduardo Habkost , Richard Henderson , Mahmoud Mandour , Yanan Wang , Wainer dos Santos Moschetta X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725990120169116600 Content-Type: text/plain; charset="utf-8" The upstream install instructions: https://docs.gitlab.com/runner/install/linux-repository.html Now refer to repositories and a setup script. Modernise the playbook to use the preferred delivery method. Message-Id: <20240910140733.4007719-5-alex.bennee@linaro.org> Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e --- scripts/ci/setup/gitlab-runner.yml | 39 +++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-r= unner.yml index 7bdafab511..57e7faebf1 100644 --- a/scripts/ci/setup/gitlab-runner.yml +++ b/scripts/ci/setup/gitlab-runner.yml @@ -49,30 +49,51 @@ - debug: msg: gitlab-runner arch is {{ gitlab_runner_arch }} =20 - - name: Download the matching gitlab-runner (DEB) + # Debian/Ubuntu setup + - name: Get gitlab-runner repo setup script (DEB) get_url: dest: "/root/" - url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/= gitlab-runner_{{ gitlab_runner_arch }}.deb" + url: "https://packages.gitlab.com/install/repositories/runner/gitl= ab-runner/script.deb.sh" + mode: 0755 when: - ansible_facts['distribution'] =3D=3D 'Ubuntu' =20 - - name: Download the matching gitlab-runner (RPM) + - name: Run gitlab-runner repo setup script (DEB) + shell: "/root/script.deb.sh" + when: + - ansible_facts['distribution'] =3D=3D 'Ubuntu' + + - name: Install gitlab-runner (DEB) + ansible.builtin.apt: + name: gitlab-runner + update_cache: yes + state: present + when: + - ansible_facts['distribution'] =3D=3D 'Ubuntu' + + # RPM setup + - name: Get gitlab-runner repo setup script (RPM) get_url: dest: "/root/" - url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/rpm/= gitlab-runner_{{ gitlab_runner_arch }}.rpm" + url: "https://packages.gitlab.com/install/repositories/runner/gitl= ab-runner/script.rpm.sh" + mode: 0755 when: - ansible_facts['distribution'] =3D=3D 'CentOS' =20 - - name: Install gitlab-runner via package manager (DEB) - apt: deb=3D"/root/gitlab-runner_{{ gitlab_runner_arch }}.deb" + - name: Run gitlab-runner repo setup script (RPM) + shell: "/root/script.rpm.sh" when: - - ansible_facts['distribution'] =3D=3D 'Ubuntu' + - ansible_facts['distribution'] =3D=3D 'CentOS' =20 - - name: Install gitlab-runner via package manager (RPM) - yum: name=3D"/root/gitlab-runner_{{ gitlab_runner_arch }}.rpm" + - name: Install gitlab-runner (RPM) + yum: + name: gitlab-runner + update_cache: yes + state: present when: - ansible_facts['distribution'] =3D=3D 'CentOS' =20 + # Register Runners - name: Register the gitlab-runner command: "/usr/bin/gitlab-runner register --non-interactive --url {{= gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registra= tion_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"= ] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distrib= ution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{= ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture= \"] }} ({{ ansible_facts[\"os_family\"] }})'" =20 --=20 2.39.2