@@ -74,18 +74,18 @@
- 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\"] }})'"
+ command: "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\"] }})'"
# The secondary runner will still run under the single gitlab-runner service
- name: Register secondary 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 aarch32,{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'"
+ command: "gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list aarch32,{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'"
when:
- ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['architecture'] == 'aarch64'
- ansible_facts['distribution_version'] == '22.04'
- name: Install the gitlab-runner service using its own functionality
- command: "/usr/bin/gitlab-runner install --user gitlab-runner --working-directory /home/gitlab-runner"
+ command: "gitlab-runner install --user gitlab-runner --working-directory /home/gitlab-runner"
register: gitlab_runner_install_service_result
failed_when: "gitlab_runner_install_service_result.rc != 0 and \"already exists\" not in gitlab_runner_install_service_result.stderr"
Distributions are not forced to put gitlab-runner binary in /usr/bin (as long as it is in $PATH). Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- FWIW this file seems to use legacy options: TASK [Register the gitlab-runner] ******************************************************************************************************************* task path: /srcqemu/scripts/ci/setup/gitlab-runner.yml:78 changed: [oe2203] => {"changed": true, "cmd": ["gitlab-runner", "register", "--non-interactive", "--url", "https://gitlab.com", "--registration-token", "glrt-FOO_BAR", "--executor", "shell", "--tag-list", "loongarch64,openeuler_22.03", "--description", "openEuler 22.03 loongarch64 (Loongson)"], "delta": "0:00:00.955654", "end": "2024-01-04 02:33:23.607766", "msg": "", "rc": 0, "start": "2024-01-04 02:33:22.652112", "stderr": "Runtime platform \u001b[0;m arch\u001b[0;m=loong64 os\u001b[0;m=linux pid\u001b[0;m=147134 revision\u001b[0;m=436955cb version\u001b[0;m=16.6.1\nRunning in system-mode. \u001b[0;m \n \u001b[0;m \n\u001b[0;33mWARNING: You have specified an authentication token in the legacy parameter --registration-token. This has triggered the 'legacy-compatible registration process' which has resulted in the following command line parameters being ignored: --locked, --access-level, --run-untagged, --maximum-timeout, --paused, --tag-list, and --maintenance-note. For more information, see https://docs.gitlab.com/ee/ci/runners/new_creation_workflow.html#changes-to-the-gitlab-runner-register-command-syntaxThese parameters and the legacy-compatible registration process will be removed in GitLab Runner 18.0. \u001b[0;m \nVerifying runner... is valid \u001b[0;m runner\u001b[0;m=kDNtto8nr\nRunner registered successfully. Feel free to start it, but if it's running already the config should be automatically reloaded!\n\u001b[0;m \nConfiguration (with the authentication token) was saved in \"/etc/gitlab-runner/config.toml\"\u001b[0;m ", "stderr_lines": ["Runtime platform \u001b[0;m arch\u001b[0;m=loong64 os\u001b[0;m=linux pid\u001b[0;m=147134 revision\u001b[0;m=436955cb version\u001b[0;m=16.6.1", "Running in system-mode. \u001b[0;m ", " \u001b[0;m ", "\u001b[0;33mWARNING: You have specified an authentication token in the legacy parameter --registration-token. This has triggered the 'legacy-compatible registration process' which has resulted in the following command line parameters being ignored: --locked, --access-level, --run-untagged, --maximum-timeout, --paused, --tag-list, and --maintenance-note. For more information, see https://docs.gitlab.com/ee/ci/runners/new_creation_workflow.html#changes-to-the-gitlab-runner-register-command-syntaxThese parameters and the legacy-compatible registration process will be removed in GitLab Runner 18.0. \u001b[0;m ", "Verifying runner... is valid \u001b[0;m runner\u001b[0;m=kDNtto8nr", "Runner registered successfully. Feel free to start it, but if it's running already the config should be automatically reloaded!", "\u001b[0;m ", "Configuration (with the authentication token) was saved in \"/etc/gitlab-runner/config.toml\"\u001b[0;m "], "stdout": "", "stdout_lines": []} --- scripts/ci/setup/gitlab-runner.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)