[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/31] scripts/ci: update gitlab-runner playbook to handle CentOS
From: |
Alex Bennée |
Subject: |
[PULL 04/31] scripts/ci: update gitlab-runner playbook to handle CentOS |
Date: |
Sat, 18 Mar 2023 11:46:17 +0000 |
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>
Message-Id: <20230315174331.2959-5-alex.bennee@linaro.org>
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
- [PULL 00/31] various fixes (testing, plugins, gitdm), Alex Bennée, 2023/03/18
- [PULL 07/31] tests/tcg: add some help output for running individual tests, Alex Bennée, 2023/03/18
- [PULL 03/31] scripts/ci: add libslirp-devel to build-environment, Alex Bennée, 2023/03/18
- [PULL 02/31] tests/docker: all add DOCKER_BUILDKIT to RUNC environment, Alex Bennée, 2023/03/18
- [PULL 04/31] scripts/ci: update gitlab-runner playbook to handle CentOS,
Alex Bennée <=
- [PULL 01/31] tests/avocado: update AArch64 tests to Alpine 3.17.2, Alex Bennée, 2023/03/18
- [PULL 10/31] tcg: Drop plugin_gen_disable_mem_helpers from tcg_gen_exit_tb, Alex Bennée, 2023/03/18
- [PULL 05/31] gitlab: update centos-8-stream job, Alex Bennée, 2023/03/18
- [PULL 09/31] tcg: Clear plugin_mem_cbs on TB exit, Alex Bennée, 2023/03/18
- [PULL 08/31] tests/avocado: don't use tags to define drive, Alex Bennée, 2023/03/18
- [PULL 06/31] include/qemu: add documentation for memory callbacks, Alex Bennée, 2023/03/18
- [PULL 11/31] include/qemu/plugin: Remove QEMU_PLUGIN_ASSERT, Alex Bennée, 2023/03/18
- Re: [PULL 00/31] various fixes (testing, plugins, gitdm), Peter Maydell, 2023/03/20