From nobody Sun Nov 24 08:34:15 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 172597733272344.125762440304925; Tue, 10 Sep 2024 07:08:52 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9E21119B3; Tue, 10 Sep 2024 10:08:51 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 795051859; Tue, 10 Sep 2024 10:07:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 17192166C; Tue, 10 Sep 2024 10:07:39 -0400 (EDT) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 C1B71163B for ; Tue, 10 Sep 2024 10:07:37 -0400 (EDT) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a8d100e9ce0so531529266b.2 for ; Tue, 10 Sep 2024 07:07:37 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25d64880sm480900266b.219.2024.09.10.07.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 07:07:34 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0BCDA5F9CC; Tue, 10 Sep 2024 15:07:34 +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.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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=1725977256; x=1726582056; 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=aapQk1vd/skAQcOUzQTtovi1QafMjbKZgpmgK7D3jz4=; b=ypcNQfmdculcikKSvwi1HoJkH5I3JSnqkvRWZEYCks9pr9IVQymJqa6ib9CqyiHiIP EqzpQW96bFSJO+S1B9/sjhi/nZmMUgTUCESk4BdgaqHsGcTnxAYVj5iN4NioNDcuKCdJ 30cztBUWVbjTeKhvKkHEUUkXrVwRkxoFWYbpPBKK/KBwKCakJYRJ8+alC3tQt+GDImJ+ UpDGxC0yCasf/qSA60hzjEU9OhbKiPct4HoCcOFBE1zlPYC/AOoLVskEJZuUddEGRNZF p2wiy4/hE2vJ7KqQ8UlkuUae2zLeUqBuYlreVM06miVnadRKFkHXNwNMGg0YkoukCnlo JFLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725977256; x=1726582056; 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=aapQk1vd/skAQcOUzQTtovi1QafMjbKZgpmgK7D3jz4=; b=SgLr4aS1fij0cZufwtFBz0VTcJOGdhlUI6JiXYG0By9bk9KTqhla1wQLabKCKxpFOp uXooTOo3MknHcTW6qsEQMjMzZnZZK+hnFL3I0WNzWo6X5dRFH3HbUUoTH1XHsEteuzFJ vCwZbB5KbPuSfq2YDlH0bqD9/nSQJUEsEeN5ikvtLHmUChoASMZfpuzTrlE36EyTqAVM mNJbEOfK2DfzqxEC5SEzLzdmJ4Q+kF/E6bUbaCFx+c6uEjcrTLfLXu98cRZpz6hKtQoO 5JRGr+OOQ+ift2N8iGn7Yv4mhKz2ykal1XKQa1FL6acYFe1iGJBApHRNlfONn+pHuEAG eOIQ== X-Forwarded-Encrypted: i=1; AJvYcCVDXwoXpV//B9y4m8rWnEuIoJQqWcUstKVsVB/qS3bLcV6/RKFR4ZpT/RloDxpwCxMQrwj7Kw==@lists.libvirt.org X-Gm-Message-State: AOJu0YyBV0gbPp3B/45xAWbv5ml42QC1KU6jL0h+56WUv3q2T7nMeaPL 4GyIKjWAHoJkZLfGT4VLXrARf+1jI1AHClqzIGD1LmM8I/MlEqriBcCzJElS6IQ= X-Google-Smtp-Source: AGHT+IEVAIEEqGMWQsXh9dt5MPuBFRt53jahMB917OVma3lzDJh9VVW7y8UMT1SN4mnhFtYUk1VutQ== X-Received: by 2002:a17:907:7ea3:b0:a86:9f56:21e6 with SMTP id a640c23a62f3a-a8ffab832ebmr81996566b.33.1725977256225; Tue, 10 Sep 2024 07:07:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH 04/26] scripts/ci: update the gitlab-runner playbook Date: Tue, 10 Sep 2024 15:07:11 +0100 Message-Id: <20240910140733.4007719-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240910140733.4007719-1-alex.bennee@linaro.org> References: <20240910140733.4007719-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: YEASM2IM6GKC3RAG2EPE4ORROSOQTWB2 X-Message-ID-Hash: YEASM2IM6GKC3RAG2EPE4ORROSOQTWB2 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: Eduardo Habkost , Zhao Liu , Marcel Apfelbaum , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , Yanan Wang , Peter Maydell , Mahmoud Mandour , Thomas Huth , qemu-arm@nongnu.org, devel@lists.libvirt.org, Jiaxun Yang , Paolo Bonzini , Richard Henderson , 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: 1725977334877116600 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. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- 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