From patchwork Tue Nov 19 10:15:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13879566 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 385CAD60D1B for ; Tue, 19 Nov 2024 10:15:53 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.839867.1255647 (Exim 4.92) (envelope-from ) id 1tDLGg-0002GE-4G; Tue, 19 Nov 2024 10:15:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 839867.1255647; Tue, 19 Nov 2024 10:15:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tDLGg-0002G7-1j; Tue, 19 Nov 2024 10:15:34 +0000 Received: by outflank-mailman (input) for mailman id 839867; Tue, 19 Nov 2024 10:15:33 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tDLGf-0002Fv-8z for xen-devel@lists.xenproject.org; Tue, 19 Nov 2024 10:15:33 +0000 Received: from mail180-8.suw31.mandrillapp.com (mail180-8.suw31.mandrillapp.com [198.2.180.8]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 333df21e-a65f-11ef-a0ca-8be0dac302b0; Tue, 19 Nov 2024 11:15:29 +0100 (CET) Received: from pmta11.mandrill.prod.suw01.rsglab.com (localhost [127.0.0.1]) by mail180-8.suw31.mandrillapp.com (Mailchimp) with ESMTP id 4Xt0k757nGz3sPRrF for ; Tue, 19 Nov 2024 10:15:27 +0000 (GMT) Received: from [37.26.189.201] by mandrillapp.com id ef929aefa4224d2d90be6618ac4f5e6d; Tue, 19 Nov 2024 10:15:27 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 333df21e-a65f-11ef-a0ca-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjE5OC4yLjE4MC44IiwiaGVsbyI6Im1haWwxODAtOC5zdXczMS5tYW5kcmlsbGFwcC5jb20ifQ== X-Custom-Transaction: eyJpZCI6IjMzM2RmMjFlLWE2NWYtMTFlZi1hMGNhLThiZTBkYWMzMDJiMCIsInRzIjoxNzMyMDExMzI5LjQxODczNSwic2VuZGVyIjoiYm91bmNlLW1kXzMwNTA0OTYyLjY3M2M2NTNmLnYxLWVmOTI5YWVmYTQyMjRkMmQ5MGJlNjYxOGFjNGY1ZTZkQGJvdW5jZS52YXRlcy50ZWNoIiwicmVjaXBpZW50IjoieGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnIn0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandrillapp.com; s=mte1; t=1732011327; x=1732271827; bh=RIWpJ0A3VZ4bOVwkV3aBkXgnRBJhre0EC0Obc/Sc5m4=; h=From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID: Date:MIME-Version:Content-Type:Content-Transfer-Encoding:CC:Date: Subject:From; b=c4ubLgvBc6kOozdSnOrwV07z33h0cuWIzwD9WKO8I8R9zw2ivje8XocrtTLPhOMua OKle6DW7nUpffV3w/TKDJ6ETpCOOJFwPvi78A1zbr+a7/k6B6KQGu58kw+pbyOH2XO WWpEw/iPjtZx8Zl3eJe+XHhdWuQOpfimFhPw4HY80wkQ8JF1/xn7ZIv1qGBdxnW6te Dsu5rANJWXjWT/AeKV5uWbDhsKxUTLTWmPwtqa8ihRJMHa6EHE+0zJuv9Uixo+UAd8 CysuLKiAh9HWL0F5i+cdXt5OHXL3fMaTADmRuuenFOSsYNukcmdplPt9I9SwTZCE7p z3iRSaPEICXww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vates.tech; s=mte1; t=1732011327; x=1732271827; i=anthony.perard@vates.tech; bh=RIWpJ0A3VZ4bOVwkV3aBkXgnRBJhre0EC0Obc/Sc5m4=; h=From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID: Date:MIME-Version:Content-Type:Content-Transfer-Encoding:CC:Date: Subject:From; b=v4TfUeSewpovWRJY9AkRjbvM+LJKx4gZEzVUakhkA244T/hIRlaNDjX4fcy5kQbW9 GqYAwpunwwbCpfFZ5hBaCIpmLd5OAWKqsDIMFArutX1o8dY7XdXK9A2/QV0ZYixDZJ JhXXWfFI8QcUsf68xmrEWvrsPRZ7ImJ0Xis20zbWcU4wB7/VSw5lj2XD6ywPjugeMD HpSAC406rhLP9ZgUzaJCQl8Qe1TI2gHhN7W7lMkKQPOyCmGbGVx9nDliv9txKAP9mX IgQSy7WBMZu25iCq2KzBQkWd6lu876278v+LuwQ4MNKzgcNzJItjj5ok139S/dwGdt M4VByl8HgwAww== From: "Anthony PERARD" Subject: =?utf-8?q?=5BXEN_PATCH_v2_1/3=5D_CI=3A_Remove_deprecated_=22only=3A?= =?utf-8?q?variables=22_in_favor_of_=22rules=3Aif=22?= X-Mailer: git-send-email 2.39.5 X-Bm-Disclaimer: Yes X-Bm-Milter-Handled: 4ffbd6c1-ee69-4e1b-aabd-f977039bd3e2 X-Bm-Transport-Timestamp: 1732011326475 To: xen-devel@lists.xenproject.org Cc: "Andrew Cooper" , "Anthony PERARD" , "Stefano Stabellini" , "Doug Goldstein" Message-Id: <20241119101449.49747-2-anthony.perard@vates.tech> In-Reply-To: <20241119101449.49747-1-anthony.perard@vates.tech> References: <20241119101449.49747-1-anthony.perard@vates.tech> X-Native-Encoded: 1 X-Report-Abuse: =?utf-8?q?Please_forward_a_copy_of_this_message=2C_including?= =?utf-8?q?_all_headers=2C_to_abuse=40mandrill=2Ecom=2E_You_can_also_report_?= =?utf-8?q?abuse_here=3A_https=3A//mandrillapp=2Ecom/contact/abuse=3Fid=3D30?= =?utf-8?q?504962=2Eef929aefa4224d2d90be6618ac4f5e6d?= X-Mandrill-User: md_30504962 Feedback-ID: 30504962:30504962.20241119:md Date: Tue, 19 Nov 2024 10:15:27 +0000 MIME-Version: 1.0 Also, this prevent using "rules", like in the ".test-jobs-common" template. https://docs.gitlab.com/ee/ci/yaml/#only--except Signed-off-by: Anthony PERARD Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/test.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index f5dd4de757..ab5c8be0cd 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -98,9 +98,8 @@ - '*.log' - '*.dtb' when: always - only: - variables: - - $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" + rules: + - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -117,9 +116,8 @@ - smoke.serial - '*.log' when: always - only: - variables: - - $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" + rules: + - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -137,9 +135,8 @@ - smoke.serial - '*.log' when: always - only: - variables: - - $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" + rules: + - if: $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - qubes-hw2 From patchwork Tue Nov 19 10:15:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13879568 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7C600D60D1B for ; Tue, 19 Nov 2024 10:16:00 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.839868.1255657 (Exim 4.92) (envelope-from ) id 1tDLGh-0002UG-Be; Tue, 19 Nov 2024 10:15:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 839868.1255657; Tue, 19 Nov 2024 10:15:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tDLGh-0002U9-7b; Tue, 19 Nov 2024 10:15:35 +0000 Received: by outflank-mailman (input) for mailman id 839868; Tue, 19 Nov 2024 10:15:33 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tDLGf-0002Fw-KB for xen-devel@lists.xenproject.org; Tue, 19 Nov 2024 10:15:33 +0000 Received: from mail180-8.suw31.mandrillapp.com (mail180-8.suw31.mandrillapp.com [198.2.180.8]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 333c608c-a65f-11ef-99a3-01e77a169b0f; Tue, 19 Nov 2024 11:15:29 +0100 (CET) Received: from pmta11.mandrill.prod.suw01.rsglab.com (localhost [127.0.0.1]) by mail180-8.suw31.mandrillapp.com (Mailchimp) with ESMTP id 4Xt0k76LnDz3sNN6m for ; Tue, 19 Nov 2024 10:15:27 +0000 (GMT) Received: from [37.26.189.201] by mandrillapp.com id 40ce3e99be984ec999e1dd0e97b54b82; Tue, 19 Nov 2024 10:15:27 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 333c608c-a65f-11ef-99a3-01e77a169b0f X-Custom-Connection: eyJyZW1vdGVpcCI6IjE5OC4yLjE4MC44IiwiaGVsbyI6Im1haWwxODAtOC5zdXczMS5tYW5kcmlsbGFwcC5jb20ifQ== X-Custom-Transaction: eyJpZCI6IjMzM2M2MDhjLWE2NWYtMTFlZi05OWEzLTAxZTc3YTE2OWIwZiIsInRzIjoxNzMyMDExMzI5LjQyNjg5MSwic2VuZGVyIjoiYm91bmNlLW1kXzMwNTA0OTYyLjY3M2M2NTNmLnYxLTQwY2UzZTk5YmU5ODRlYzk5OWUxZGQwZTk3YjU0YjgyQGJvdW5jZS52YXRlcy50ZWNoIiwicmVjaXBpZW50IjoieGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnIn0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandrillapp.com; s=mte1; t=1732011327; x=1732271827; bh=HR2hDnjhAgEJ8WW/gV410/qk4KVU8YB7FIJYf9zTtIk=; h=From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID: Date:MIME-Version:Content-Type:Content-Transfer-Encoding:CC:Date: Subject:From; b=brGrOgC/vqHmJpXRfLqoxwPJrOKupIJBPT+9ZdyJn3zahw8cEcPb7itKRfueKXIMP UcXEMwm4E/y9FJ8Z6P5JRCWGMCbD/tK31v6Eq6aiojlnDxUMtLA9PA7OadcQutWC3k 7XuUPzMrNyjfYjnWiXhbLIEOsLqPexsi/oTL3pi5TU4dlYhef7EHKgAmgWDrM5BMXk h6oQff9D0gRfetHY+Ndwt09kmwcs/jZ9ZudPqEAO65r5f0AvY7ADPvwh31gV/qNLJi 1sEVjUFRg+0lkKy1Mqrh5mZMVX4EQ3wVf3OYFPQ891gIjfV6EAEovhapeQaK1Yzk30 qg4qmFf046Lew== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vates.tech; s=mte1; t=1732011327; x=1732271827; i=anthony.perard@vates.tech; bh=HR2hDnjhAgEJ8WW/gV410/qk4KVU8YB7FIJYf9zTtIk=; h=From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID: Date:MIME-Version:Content-Type:Content-Transfer-Encoding:CC:Date: Subject:From; b=t15bFwARbjiUg99xAfxhFT8Zp6jDT0iLJ4wHNxMSGv3N/2ANO1G7qcQntg3yKU1zR 0IOIzNbWfEwFv7xSoj8AuJ4xhHAAQJwvYH7T9Zc7nPFDBPHqGcwcf5q+Z3JXQOpKYQ ktl+NXSByRWhNj4Ddhust+cId/01K4kdsBWnD/t7pfDxhOKIfpi4G70lUv9VegUj1h jzEK77x8UzRG4xwSGZgT1ZNBCmgjLCwuEpU5lRRBxpDVW3WwRxyBLfNV3/ioDohi2t sK6uJQMRc/E/bNQ06SGdg5iaGqFnyiZ9uH1z8Oj+tdoq5Vy6jeKTHZGodx57UbX2WW lTZ324UNho5SQ== From: "Anthony PERARD" Subject: =?utf-8?q?=5BXEN_PATCH_v2_2/3=5D_CI=3A_Define_XEN=5FREGISTRY_variab?= =?utf-8?q?le?= X-Mailer: git-send-email 2.39.5 X-Bm-Disclaimer: Yes X-Bm-Milter-Handled: 4ffbd6c1-ee69-4e1b-aabd-f977039bd3e2 X-Bm-Transport-Timestamp: 1732011326911 To: xen-devel@lists.xenproject.org Cc: "Andrew Cooper" , "Anthony PERARD" , "Stefano Stabellini" , "Doug Goldstein" Message-Id: <20241119101449.49747-3-anthony.perard@vates.tech> In-Reply-To: <20241119101449.49747-1-anthony.perard@vates.tech> References: <20241119101449.49747-1-anthony.perard@vates.tech> X-Native-Encoded: 1 X-Report-Abuse: =?utf-8?q?Please_forward_a_copy_of_this_message=2C_including?= =?utf-8?q?_all_headers=2C_to_abuse=40mandrill=2Ecom=2E_You_can_also_report_?= =?utf-8?q?abuse_here=3A_https=3A//mandrillapp=2Ecom/contact/abuse=3Fid=3D30?= =?utf-8?q?504962=2E40ce3e99be984ec999e1dd0e97b54b82?= X-Mandrill-User: md_30504962 Feedback-ID: 30504962:30504962.20241119:md Date: Tue, 19 Nov 2024 10:15:27 +0000 MIME-Version: 1.0 This allow to change the registry used for container in a single place, and could be controlled via other mean. Signed-off-by: Anthony PERARD Reviewed-by: Stefano Stabellini --- .gitlab-ci.yml | 3 +++ automation/gitlab-ci/build.yaml | 4 ++-- automation/gitlab-ci/test.yaml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef4484e09a..941e5822e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +variables: + XEN_REGISTRY: registry.gitlab.com/xen-project/xen + workflow: rules: - if: $CI_COMMIT_BRANCH =~ /^(master|smoke|^coverity-tested\/.*|stable-.*)$/ diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index ce39b0ee21..1ca6764225 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -1,6 +1,6 @@ .build-tmpl: &build stage: build - image: registry.gitlab.com/xen-project/xen/${CONTAINER} + image: ${XEN_REGISTRY}/${CONTAINER} script: - ./automation/scripts/build 2>&1 | tee build.log artifacts: @@ -208,7 +208,7 @@ .yocto-test: stage: build - image: registry.gitlab.com/xen-project/xen/${CONTAINER} + image: ${XEN_REGISTRY}/${CONTAINER} script: - ./automation/build/yocto/build-yocto.sh -v --log-dir=./logs --xen-dir=`pwd` ${YOCTO_BOARD} ${YOCTO_OUTPUT} variables: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index ab5c8be0cd..1822e3ea5f 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -1,6 +1,6 @@ .test-jobs-common: stage: test - image: registry.gitlab.com/xen-project/xen/${CONTAINER} + image: ${XEN_REGISTRY}/${CONTAINER} .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export From patchwork Tue Nov 19 10:15:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13879569 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C845ED62067 for ; Tue, 19 Nov 2024 10:16:00 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.839869.1255667 (Exim 4.92) (envelope-from ) id 1tDLGi-0002ig-K7; Tue, 19 Nov 2024 10:15:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 839869.1255667; Tue, 19 Nov 2024 10:15:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tDLGi-0002iZ-HJ; Tue, 19 Nov 2024 10:15:36 +0000 Received: by outflank-mailman (input) for mailman id 839869; Tue, 19 Nov 2024 10:15:35 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tDLGh-0002Fv-B4 for xen-devel@lists.xenproject.org; Tue, 19 Nov 2024 10:15:35 +0000 Received: from mail180-8.suw31.mandrillapp.com (mail180-8.suw31.mandrillapp.com [198.2.180.8]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 35a34943-a65f-11ef-a0ca-8be0dac302b0; Tue, 19 Nov 2024 11:15:33 +0100 (CET) Received: from pmta11.mandrill.prod.suw01.rsglab.com (localhost [127.0.0.1]) by mail180-8.suw31.mandrillapp.com (Mailchimp) with ESMTP id 4Xt0k81qHjz3sNZlL for ; Tue, 19 Nov 2024 10:15:28 +0000 (GMT) Received: from [37.26.189.201] by mandrillapp.com id 777426e5b10b465a963a688c0ea251a7; Tue, 19 Nov 2024 10:15:28 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 35a34943-a65f-11ef-a0ca-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjE5OC4yLjE4MC44IiwiaGVsbyI6Im1haWwxODAtOC5zdXczMS5tYW5kcmlsbGFwcC5jb20ifQ== X-Custom-Transaction: eyJpZCI6IjM1YTM0OTQzLWE2NWYtMTFlZi1hMGNhLThiZTBkYWMzMDJiMCIsInRzIjoxNzMyMDExMzMzLjM3ODM3NSwic2VuZGVyIjoiYm91bmNlLW1kXzMwNTA0OTYyLjY3M2M2NTQwLnYxLTc3NzQyNmU1YjEwYjQ2NWE5NjNhNjg4YzBlYTI1MWE3QGJvdW5jZS52YXRlcy50ZWNoIiwicmVjaXBpZW50IjoieGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnIn0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandrillapp.com; s=mte1; t=1732011328; x=1732271828; bh=CTj79Aidpkj+HeXz2gHR27Q6nRmA1BnigZ0Th5dpiY0=; h=From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID: Date:MIME-Version:Content-Type:Content-Transfer-Encoding:CC:Date: Subject:From; b=sZy4lXE5Oa2D6fmKcBLD40opJwb4IexA/aY8//MqDa5ZccqtrNuceBtVM8A+82lsN h9cmPUZEqNDZYPIWY8iGnjj89UcPkz/gu+FFiRbZmaBWRqYaRwTP+LR0pwWMnWMzFF gDa6Yjg2wCsGufec71EYAhxjSU335iLlkqCTLSiNC4KwM6/gXMqhd/jjhxFdjBWB8v uKOu93Xd5uxeISnLaXq8CYOeoqrf9AfJh6gjvwF6l5vbxR7CAwKNsYBSCxjNtWgQip X5rX4V+U9oQZm0w5CZUF6p5Xm0lYY7nUEbxS1DGGk81+vqv3UO2Z/HlVrqZWJb+C5y zsPpVK4ne0aMQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vates.tech; s=mte1; t=1732011328; x=1732271828; i=anthony.perard@vates.tech; bh=CTj79Aidpkj+HeXz2gHR27Q6nRmA1BnigZ0Th5dpiY0=; h=From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID: Date:MIME-Version:Content-Type:Content-Transfer-Encoding:CC:Date: Subject:From; b=euz67s3ZbyWB3xrOo73vbxLffaggiB9bULruAz4hT4dIE8cCdk+hxi7IfygdC0hpF UJAgsAf9kyfF9wgZCxNW6zxe3yu3s3P2iF4uxle0l7Hjr2/X/g4Oy7JHFiRz9Lb9WW wwpefZE/+69gJFgsB4XNFMxYI+XvvuVzQX4V3rLoz+uHDE/ETcADw/HaL39hT9SqmW U4Syvc1MhWgSCvGG11pxYCltGhLYku83mJh2EBSdMZj8wx/HY5MBI6cQL0ERxNpAHz 2KfWrWiBVltsiPHVf7ULRkk/aBLd14lGxUW4nf72v0WXZ97AzsYWe7OCuLnmoyA2ro 1NEmUz/ARiafg== From: "Anthony PERARD" Subject: =?utf-8?q?=5BXEN_PATCH_v2_3/3=5D_CI=3A_New_stage_=22containers=22_t?= =?utf-8?q?o_rebuild_some_containers?= X-Mailer: git-send-email 2.39.5 X-Bm-Disclaimer: Yes X-Bm-Milter-Handled: 4ffbd6c1-ee69-4e1b-aabd-f977039bd3e2 X-Bm-Transport-Timestamp: 1732011327208 To: xen-devel@lists.xenproject.org Cc: "Andrew Cooper" , "Anthony PERARD" , "Doug Goldstein" , "Stefano Stabellini" Message-Id: <20241119101449.49747-4-anthony.perard@vates.tech> In-Reply-To: <20241119101449.49747-1-anthony.perard@vates.tech> References: <20241119101449.49747-1-anthony.perard@vates.tech> X-Native-Encoded: 1 X-Report-Abuse: =?utf-8?q?Please_forward_a_copy_of_this_message=2C_including?= =?utf-8?q?_all_headers=2C_to_abuse=40mandrill=2Ecom=2E_You_can_also_report_?= =?utf-8?q?abuse_here=3A_https=3A//mandrillapp=2Ecom/contact/abuse=3Fid=3D30?= =?utf-8?q?504962=2E777426e5b10b465a963a688c0ea251a7?= X-Mandrill-User: md_30504962 Feedback-ID: 30504962:30504962.20241119:md Date: Tue, 19 Nov 2024 10:15:28 +0000 MIME-Version: 1.0 Rebuild rolling release containers when XEN_CI_REBUILD_CONTAINERS is set. This is to be use with a scheduled pipeline. Signed-off-by: Anthony PERARD Reviewed-by: Stefano Stabellini --- Notes: v2: - remove the logic to test containers once rebuilt. - only include the config with jobs for the "containers" stage wen XEN_CI_REBUILD_CONTAINERS is set. .gitlab-ci.yml | 16 ++++++++++++--- automation/gitlab-ci/containers.yaml | 29 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 automation/gitlab-ci/containers.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 941e5822e8..5a9b8b7228 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,11 +8,21 @@ workflow: - when: always stages: + - containers - analyze - build - test include: - - 'automation/gitlab-ci/analyze.yaml' - - 'automation/gitlab-ci/build.yaml' - - 'automation/gitlab-ci/test.yaml' + - local: 'automation/gitlab-ci/containers.yaml' + rules: + - if: $XEN_CI_REBUILD_CONTAINERS + - local: 'automation/gitlab-ci/analyze.yaml' + rules: + - if: $XEN_CI_REBUILD_CONTAINERS == null + - local: 'automation/gitlab-ci/build.yaml' + rules: + - if: $XEN_CI_REBUILD_CONTAINERS == null + - local: 'automation/gitlab-ci/test.yaml' + rules: + - if: $XEN_CI_REBUILD_CONTAINERS == null diff --git a/automation/gitlab-ci/containers.yaml b/automation/gitlab-ci/containers.yaml new file mode 100644 index 0000000000..25e8bdc34b --- /dev/null +++ b/automation/gitlab-ci/containers.yaml @@ -0,0 +1,29 @@ +.container-build-tmpl: + stage: containers + image: docker:stable + tags: + - container-builder + rules: + - if: $XEN_CI_REBUILD_CONTAINERS + services: + - docker:dind + before_script: + - apk add make + - docker info + - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY + script: + - make -C automation/build PUSH=1 REGISTRY=${XEN_REGISTRY} ${CONTAINER/:/\/} + after_script: + - docker logout + +container-archlinux-current: + extends: + - .container-build-tmpl + variables: + CONTAINER: "archlinux:current" + +container-opensuse-tumbleweed-x86_64: + extends: + - .container-build-tmpl + variables: + CONTAINER: "opensuse:tumbleweed-x86_64"