All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "David Hildenbrand" <david@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	qemu-arm@nongnu.org, "Peter Xu" <peterx@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Beraldo Leal" <bleal@redhat.com>
Subject: [PATCH 04/11] scripts/ci: update gitlab-runner playbook to handle CentOS
Date: Fri, 10 Mar 2023 10:31:16 +0000	[thread overview]
Message-ID: <20230310103123.2118519-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.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 <alex.bennee@linaro.org>
---
 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\"] }})'"
-- 
2.39.2



  parent reply	other threads:[~2023-03-10 10:32 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-10 10:31 [PATCH 00/11] tweaks and fixes for 8.0-rc1 (tests, plugins, docs) Alex Bennée
2023-03-10 10:31 ` [PATCH 01/11] tests/avocado: update AArch64 tests to Alpine 3.17.2 Alex Bennée
2023-03-10 10:31 ` [PATCH 02/11] tests/docker: all add DOCKER_BUILDKIT to RUNC environment Alex Bennée
2023-03-10 10:31 ` [PATCH 03/11] scripts/ci: add libslirp-devel to build-environment Alex Bennée
2023-03-10 10:31 ` Alex Bennée [this message]
2023-03-10 10:31 ` [PATCH 05/11] gitlab: update centos-8-stream job Alex Bennée
2023-03-10 10:31 ` [PATCH 06/11] include/qemu: add documentation for memory callbacks Alex Bennée
2023-03-10 10:31 ` [PATCH 07/11] tcg: Clear plugin_mem_cbs on TB exit Alex Bennée
2023-03-10 17:39   ` Richard Henderson
2023-03-10 17:41     ` Richard Henderson
2023-03-10 17:56       ` Alex Bennée
2023-03-10 17:59         ` Richard Henderson
2023-03-10 10:31 ` [PATCH 08/11] tests/tcg: add some help output for running individual tests Alex Bennée
2023-03-10 10:31 ` [PATCH 09/11] tests/tcg: disable pauth for aarch64 gdb tests Alex Bennée
2023-03-10 17:44   ` Richard Henderson
2023-03-10 17:47   ` Peter Maydell
2023-03-10 18:00     ` Fabiano Rosas
2023-03-10 18:07       ` Peter Maydell
2023-03-10 18:15         ` Fabiano Rosas
2023-03-13 11:16         ` Luis Machado
2023-03-10 18:14       ` Alex Bennée
2023-03-13 11:22         ` Peter Maydell
2023-03-13 11:44           ` Luis Machado
2023-03-13 19:21             ` Richard Henderson
2023-03-13 21:35               ` Peter Maydell
2023-03-14  8:20               ` Luis Machado
2023-03-15  9:50             ` Luis Machado
2023-03-17 16:37               ` Peter Maydell
2023-03-17 16:55                 ` Luis Machado
2023-03-17 17:07                   ` Peter Maydell
2023-03-17 17:12                     ` Luis Machado
2023-03-17 17:16                       ` Luis Machado
2023-03-10 18:07     ` Richard Henderson
2023-03-10 10:31 ` [PATCH 10/11] include/exec: fix kerneldoc definition Alex Bennée
2023-03-10 12:38   ` Philippe Mathieu-Daudé
2023-03-13 17:00   ` Thomas Huth
2023-03-13 17:03     ` Peter Maydell
2023-03-13 17:14       ` Thomas Huth
2023-03-13 17:30         ` Peter Maydell
2023-03-13 18:08           ` Peter Maydell
2023-03-10 10:31 ` [PATCH 11/11] tests/avocado: don't use tags to define drive Alex Bennée
2023-03-10 11:04   ` David Woodhouse
2023-03-10 12:42   ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230310103123.2118519-5-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=bleal@redhat.com \
    --cc=crosa@redhat.com \
    --cc=david@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.