From patchwork Thu Jan 4 16:07:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 759857 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp7050683wrw; Thu, 4 Jan 2024 08:08:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHA1HuR39SFd9Z1hbLwC/Ldtdy/gg16BbOcvOkB3dPaKfqcE9MBhmHrVa5T+iyiMqcEYQRW X-Received: by 2002:a05:6359:b9e:b0:175:51c1:70d2 with SMTP id gf30-20020a0563590b9e00b0017551c170d2mr648535rwb.28.1704384524216; Thu, 04 Jan 2024 08:08:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704384524; cv=none; d=google.com; s=arc-20160816; b=ndiBW25C+kTFurgkSYjLJCH0qOkvJaypHHdafgnsaxJASdde2QYPa7qM7CDdKh8id3 c7X+g6T/i8cUXD1ApVRwJFCOBc8zQVQlik+BD268KTkDv3ETiHFUafdHh3ih9kTjiQnn QYrpLCx0RbktKeZqH+avF8X8j3KplAK125TZOylLxnnv5jSo1kEYbSd0cCqIxBfqU8Io fjXMgnU3UQ8PHUQ2549cktfw9yAJpET51ICXeFmEVWKQRvg+kUrDDNfuQ5amquefs4zc pONEM0c6yHLB9eU6Eh3fNCEItuqlhLRQ6MLRepjMvslbaCmh6YFX4MFZVbENDH42Ix9e BkIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cDuZ+ZFYtuYIHlX929Wp45cTfCHBpNTDfj/l3L3UOnQ=; fh=R3RNw6DaBvLV+evL+FxxoxDT7CjbnpLl/Z/5KY3qROI=; b=Qpp3tGBO3od44OjGGOdjYtAfEXDpsb/rBKt7mYJlWpeP+xMIorgJYaMHcCRh/hyYt0 XHlxNRY+VtvH+q+RfeRP9QIg7ZRkeDt1+Mp1wkHRXxVZf2CMeSYn+ExywTs3DcAWKRpG 1ldDasdjxQRI/kW8Tiqtb6YX2xQGAuobWHZxkaqhAM7vSjpJbnhVAsAn4VxIF+57Byok GT0DeO1lvHrk7zjB3FJeY/g9ahZZqHBIuXtWgpfcWRQq2/sMRL78nSpVHDeyiiWUZUlr +WNsQ7P2xINbteGoOUCmUGeibSeXNgRmkav79AqCEoI9GJEUwC98ZBWzyjReNobqWlkS an8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="i4aQM/a0"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s6-20020ac85cc6000000b0042827cb27desi7495127qta.379.2024.01.04.08.08.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Jan 2024 08:08:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="i4aQM/a0"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLQGa-0005Md-Me; Thu, 04 Jan 2024 11:08:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLQGZ-0005ME-Bj for qemu-devel@nongnu.org; Thu, 04 Jan 2024 11:08:19 -0500 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLQGW-0007r3-Ua for qemu-devel@nongnu.org; Thu, 04 Jan 2024 11:08:19 -0500 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-555f581aed9so824270a12.3 for ; Thu, 04 Jan 2024 08:08:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704384495; x=1704989295; darn=nongnu.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=cDuZ+ZFYtuYIHlX929Wp45cTfCHBpNTDfj/l3L3UOnQ=; b=i4aQM/a0WknOOKt2Fx6GyL0AWn0e0lXhDHuKY4PYSlg5CRZPs3medE26kesDIS/sqO ZCXwwrYAhicN+DaD+RP3n2t3qCQ03E+nRnd7OV5P1TNjIaGYasEbGGlHURFNIEcIooB2 1AUo7/hEPmBUVB1MrZ/SidcIMaFUj0Eot+fPE95zNIe0K6rIhTSlxiIXPfV6QV0aiwNO J0K5cBxMo62JM+SPkJx+i49TlOJZbpLBY8xJ5M2dsODlWj/wgqhm0r87ZzOtepg3v369 jktGdoniSRt9VjahtB0IwQdgFXV6KPr7l+B53F6qmhBAhrU0lxXaxNf1CYkdejzhL31f rZcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704384495; x=1704989295; 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=cDuZ+ZFYtuYIHlX929Wp45cTfCHBpNTDfj/l3L3UOnQ=; b=kMMnSAeT2c7p/QGkiRaZgEH2t+eQyMsikg2QW8CNFaWTebTXu5Ilp9rnV0zVsNjgyw D1CrbvHWoIP3QD7z8suDK6IsW9ne1++pCec5K4HVZtUiInJdRb3pCnnyu5CJmvpGpc1a PUougSagsqkmA9UCHnD/Yxr39YMFWE/Dn5tTNpqfVQxe/Vt39oWEuN1G+Kz1IudX2Es2 qR+Te1FnCTvkCV5HpDGJxqkjVrx/WceGFYBouEFmDWBw2Hr3OsIF1XEbEYsplPvmQ7S6 PA9n9PUVg1wg7FbtM4SsHNsuPfU6Xujyt1Sp/OyRe4DLemeyA1RrHZuNpr3ruz+Mjz+5 Jd3g== X-Gm-Message-State: AOJu0Yw39Rg9x9xwFsqNGqIbeYr0zTt4aym3CQiRtNKQdNGjgcaHM8QC JKgRdCj1CQWRy5ThHSegovjmMLHWHtvVortOKVIBfZ5vN7IR2A== X-Received: by 2002:a50:d48e:0:b0:555:59f:1743 with SMTP id s14-20020a50d48e000000b00555059f1743mr502460edi.54.1704384495382; Thu, 04 Jan 2024 08:08:15 -0800 (PST) Received: from m1x-phil.lan ([176.187.194.232]) by smtp.gmail.com with ESMTPSA id f5-20020a056402194500b005571c7e4934sm20908edz.93.2024.01.04.08.08.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 04 Jan 2024 08:08:14 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Tianrui Zhao , Song Gao , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Wainer dos Santos Moschetta , Xianglai Li , Zhiguo Wu , Erik Skultety , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Xiaojuan Yang , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal Subject: [PATCH 1/9] scripts/ci: Do not enforce gitlab-runner path Date: Thu, 4 Jan 2024 17:07:57 +0100 Message-ID: <20240104160805.56856-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240104160805.56856-1-philmd@linaro.org> References: <20240104160805.56856-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=philmd@linaro.org; helo=mail-ed1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é --- 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(-) diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml index 7bdafab511..48a3ecfe72 100644 --- a/scripts/ci/setup/gitlab-runner.yml +++ b/scripts/ci/setup/gitlab-runner.yml @@ -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"