From patchwork Fri Nov 15 17:07:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13876646 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 19C73D68BCD for ; Fri, 15 Nov 2024 17:08:11 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.837872.1253799 (Exim 4.92) (envelope-from ) id 1tBznV-0008MI-AW; Fri, 15 Nov 2024 17:07:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 837872.1253799; Fri, 15 Nov 2024 17:07:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBznV-0008MB-5k; Fri, 15 Nov 2024 17:07:53 +0000 Received: by outflank-mailman (input) for mailman id 837872; Fri, 15 Nov 2024 17:07:52 +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 1tBznU-0008EW-PC for xen-devel@lists.xenproject.org; Fri, 15 Nov 2024 17:07:52 +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 2409c5a3-a374-11ef-a0c7-8be0dac302b0; Fri, 15 Nov 2024 18:07:49 +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 4Xqk3h1DFHz3sN6Mw for ; Fri, 15 Nov 2024 17:07:44 +0000 (GMT) Received: from [37.26.189.201] by mandrillapp.com id 911f05d73a954fc7a1bd553292510684; Fri, 15 Nov 2024 17:07:44 +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: 2409c5a3-a374-11ef-a0c7-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjE5OC4yLjE4MC44IiwiaGVsbyI6Im1haWwxODAtOC5zdXczMS5tYW5kcmlsbGFwcC5jb20ifQ== X-Custom-Transaction: eyJpZCI6IjI0MDljNWEzLWEzNzQtMTFlZi1hMGM3LThiZTBkYWMzMDJiMCIsInRzIjoxNzMxNjkwNDY5Ljk3NDgzLCJzZW5kZXIiOiJib3VuY2UtbWRfMzA1MDQ5NjIuNjczNzdmZTAudjEtOTExZjA1ZDczYTk1NGZjN2ExYmQ1NTMyOTI1MTA2ODRAYm91bmNlLnZhdGVzLnRlY2giLCJyZWNpcGllbnQiOiJ4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcifQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandrillapp.com; s=mte1; t=1731690464; x=1731950964; bh=P4pIChsnK2S75XQEz2Z1xQE98I83W9wIQJYlm74JqxY=; 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=lhramTlgAVKVBEeW+NufyV/0TpdDoyBxx9HA+ENbEwgs1Sfy3ACsCM2EPcZKrx4oF nIacrv+St4YIv7TMf7GZWjP3rgSqlQCGrw9cM/60YEU/bKiJ0xCjZ8FyKlK81WNTMA mdXIzgE8YBdGXCabSKcSvHEDJ/eNsuomUqTPsfas9WWvBL+44e26Pqxg4cr5hHmjsM VxtgU1lXbJK+1A89xLyUQSKHoG3E8aO37fr2Gjl+D7d9XICKzcrn9KWBRxVA7AoNGv Y23UCyti3PN31ce0xAclE5urEJTy3LuIDFx0Xe2bFtgYUBb2atKw6AMInX0QeKdArk CGO58tG9vzeNA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vates.tech; s=mte1; t=1731690464; x=1731950964; i=anthony.perard@vates.tech; bh=P4pIChsnK2S75XQEz2Z1xQE98I83W9wIQJYlm74JqxY=; 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=Xk3fSi8zYfxxu510uuftz9v2MmstQ3yyyTc/LWlBLDNF/HT/JeQmeYeuEp48//Fh9 cCNLCVD6fzdRWcEH9v0OS23usX9Do02SkXAWuJ+gHSY5gNaCTnEQWvwueNJ5czh0ky i3U5VpFB72MHcKxbho3vXfCagWxhH1tV/N3Kmmsp6SDiToVP8z6ig7HjZmfiPc9YBN l29rS8r4htLmtPk3S9Eh3lNJJ+qRXZ0Q/JX+x4ur2CNwtJxgOhPhEBwBz5ZQq0tJKe TW9INRMVPHgjZUPmLc+yAsDGuj7EaL7hZaOsRAHIXZQUY3y+azvQAJbaXoWSMKl6xA hVAw9yfbWGtMA== From: "Anthony PERARD" Subject: =?utf-8?q?=5BXEN_PATCH_1/3=5D_CI=3A_Remove_deprecated_=22only=3Avar?= =?utf-8?q?iables=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: 1731690462328 To: xen-devel@lists.xenproject.org Cc: "Andrew Cooper" , "Anthony PERARD" , "Doug Goldstein" , "Stefano Stabellini" Message-Id: <20241115170739.48983-2-anthony.perard@vates.tech> In-Reply-To: <20241115170739.48983-1-anthony.perard@vates.tech> References: <20241115170739.48983-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=2E911f05d73a954fc7a1bd553292510684?= X-Mandrill-User: md_30504962 Feedback-ID: 30504962:30504962.20241115:md Date: Fri, 15 Nov 2024 17:07:44 +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 --- 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 Fri Nov 15 17:07:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13876647 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 9446DD68BCE for ; Fri, 15 Nov 2024 17:08:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.837869.1253769 (Exim 4.92) (envelope-from ) id 1tBznS-0007dx-GX; Fri, 15 Nov 2024 17:07:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 837869.1253769; Fri, 15 Nov 2024 17:07:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBznS-0007dq-DM; Fri, 15 Nov 2024 17:07:50 +0000 Received: by outflank-mailman (input) for mailman id 837869; Fri, 15 Nov 2024 17:07:49 +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 1tBznR-0007cN-2r for xen-devel@lists.xenproject.org; Fri, 15 Nov 2024 17:07:49 +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 212b3e63-a374-11ef-99a3-01e77a169b0f; Fri, 15 Nov 2024 18:07:44 +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 4Xqk3g54dYz3sNVQP for ; Fri, 15 Nov 2024 17:07:43 +0000 (GMT) Received: from [37.26.189.201] by mandrillapp.com id 26ab0b26c4c54e4ba4521ef776a8d6b6; Fri, 15 Nov 2024 17:07:43 +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: 212b3e63-a374-11ef-99a3-01e77a169b0f X-Custom-Connection: eyJyZW1vdGVpcCI6IjE5OC4yLjE4MC44IiwiaGVsbyI6Im1haWwxODAtOC5zdXczMS5tYW5kcmlsbGFwcC5jb20ifQ== X-Custom-Transaction: eyJpZCI6IjIxMmIzZTYzLWEzNzQtMTFlZi05OWEzLTAxZTc3YTE2OWIwZiIsInRzIjoxNzMxNjkwNDY1LjA2NDMxNSwic2VuZGVyIjoiYm91bmNlLW1kXzMwNTA0OTYyLjY3Mzc3ZmRmLnYxLTI2YWIwYjI2YzRjNTRlNGJhNDUyMWVmNzc2YThkNmI2QGJvdW5jZS52YXRlcy50ZWNoIiwicmVjaXBpZW50IjoieGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnIn0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandrillapp.com; s=mte1; t=1731690463; x=1731950963; bh=C/3nS0B3FxW0IYBQw5KNz7UW4iI6k84L2rv+d7Y+KF8=; 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=Jqumo7U6FMDzyOh+xzAzg7vt1N0krwYpssPwrzBojneYwRuV+8Z88ILgP+Ekf+6pU /Oiqibv1APztQyjp0rxWVRnOAa7LGs9F3YJAKK39BnJrIeUbuRsKLURdk4Pg3Jjg3z oXm5naUobNn6TwvWY6rY4iifHtUCDQt8ttPuAuEVtq72c4gzd+cJ4O77NM6H+zxfJT jnt+Y7VVtoWWmEcqr0HtVYSQgij97F4B5HRDO7XkpmhvKIW1y/eSJyTxG1kAgudOTR ePvYVmgQZcksBUVpTHObZK2oPhYyROBi3iDS7Twar1YQ5PekAafp5hCCl/vS+raBhk wcY83ZeztbwaQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vates.tech; s=mte1; t=1731690463; x=1731950963; i=anthony.perard@vates.tech; bh=C/3nS0B3FxW0IYBQw5KNz7UW4iI6k84L2rv+d7Y+KF8=; 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=gWWARnA1Ge8rthEABYHKgoYMOIM29NYpfgPabOO3MeFFIo53F6ejPL6DYrWi6bHjD 1bMFsvkZAPL5h95XAoEQmXOBe2oVjtsQqGO8yYP5MO5j3b98xhDlOkrjQsRwkflRYz 4Pot2vYbV1OJSxL7RTVe+U92l4JKLwHjc0vm02nRn8MGF6uvIYu/uYYx5HtnKw1krx zFtdqLalQgXpNAtuIUfUxCFpIbyqxiO5s6ODPjImZaphVfLrvDzYCYrBgiCJtLSXJo OQJDKNC/o0rC03v1heaY9+ven1vRYwB2K4iK9bOfvuI6HkOETED8BtTfMkcs6OaM7o l8Nol878nnkag== From: "Anthony PERARD" Subject: =?utf-8?q?=5BXEN_PATCH_2/3=5D_CI=3A_Define_XEN=5FREGISTRY_variable?= 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: 1731690462684 To: xen-devel@lists.xenproject.org Cc: "Andrew Cooper" , "Anthony PERARD" , "Doug Goldstein" , "Stefano Stabellini" Message-Id: <20241115170739.48983-3-anthony.perard@vates.tech> In-Reply-To: <20241115170739.48983-1-anthony.perard@vates.tech> References: <20241115170739.48983-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=2E26ab0b26c4c54e4ba4521ef776a8d6b6?= X-Mandrill-User: md_30504962 Feedback-ID: 30504962:30504962.20241115:md Date: Fri, 15 Nov 2024 17:07:43 +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 --- .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 Fri Nov 15 17:07:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13876644 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 CD838D68BCE for ; Fri, 15 Nov 2024 17:08:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.837871.1253788 (Exim 4.92) (envelope-from ) id 1tBznT-00086h-WD; Fri, 15 Nov 2024 17:07:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 837871.1253788; Fri, 15 Nov 2024 17:07:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBznT-00086a-TR; Fri, 15 Nov 2024 17:07:51 +0000 Received: by outflank-mailman (input) for mailman id 837871; Fri, 15 Nov 2024 17:07:50 +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 1tBznS-0007cN-O6 for xen-devel@lists.xenproject.org; Fri, 15 Nov 2024 17:07:50 +0000 Received: from mail136-26.atl41.mandrillapp.com (mail136-26.atl41.mandrillapp.com [198.2.136.26]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 21bcbd8b-a374-11ef-99a3-01e77a169b0f; Fri, 15 Nov 2024 18:07:45 +0100 (CET) Received: from pmta11.mandrill.prod.atl01.rsglab.com (localhost [127.0.0.1]) by mail136-26.atl41.mandrillapp.com (Mailchimp) with ESMTP id 4Xqk3h03ZQzJKFHwd for ; Fri, 15 Nov 2024 17:07:44 +0000 (GMT) Received: from [37.26.189.201] by mandrillapp.com id 5cbf7a7fed934b029d368e370fa901a3; Fri, 15 Nov 2024 17:07:43 +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: 21bcbd8b-a374-11ef-99a3-01e77a169b0f X-Custom-Connection: eyJyZW1vdGVpcCI6IjE5OC4yLjEzNi4yNiIsImhlbG8iOiJtYWlsMTM2LTI2LmF0bDQxLm1hbmRyaWxsYXBwLmNvbSJ9 X-Custom-Transaction: eyJpZCI6IjIxYmNiZDhiLWEzNzQtMTFlZi05OWEzLTAxZTc3YTE2OWIwZiIsInRzIjoxNzMxNjkwNDY1Ljg5NjU2Niwic2VuZGVyIjoiYm91bmNlLW1kXzMwNTA0OTYyLjY3Mzc3ZmRmLnYxLTVjYmY3YTdmZWQ5MzRiMDI5ZDM2OGUzNzBmYTkwMWEzQGJvdW5jZS52YXRlcy50ZWNoIiwicmVjaXBpZW50IjoieGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnIn0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandrillapp.com; s=mte1; t=1731690464; x=1731950964; bh=z5g9B4pcUfOV2QfB5jo7SdrQJ3IQc5YdeVG72LGap4o=; 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=Hk4NxCOp/FChU9Ti2r9+jQ5n044Ox07SJMSUf7DxqhNfIwjwHSG7UD+T5SnFVjK5o JqWMm+O1PxSQoXuf43JDbjddzfuHHEp4+NCtd7Wn2MUOgJxB/gVPv3cpQ++RnWXUin KXNaaqUOfFQ8TCzI/6oxOjLJ/UIcycWT85Zjsxhk7YNc/TBEukXkvKwY7uRtLVhW3U eNDZxcVKXPcG3md0TSD6wnbvLVLy3HXEKXvz0DisL7oXnaCxLqmBNy9ohKeX+ZuxFx QiK6zdLcnOGo48CL6oalJDUirhACNAuCJL4URupNjqkLVLjP91DtdVAiUu4Sp7HuMZ hK0yBndnKUXRg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vates.tech; s=mte1; t=1731690464; x=1731950964; i=anthony.perard@vates.tech; bh=z5g9B4pcUfOV2QfB5jo7SdrQJ3IQc5YdeVG72LGap4o=; 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=hDqUtCwTHD1UfZV833jARuyN2m2wIKTiUDdAGUmEnC1Lnhaf80iG3/hTc5CzQbjrz G0bDs2wSDn0YbPM95AQwBLZj0j5JSfQZIAZFG0l90hbR0cSEd9+TkMuAkj9fTTHAaA r24kdRCyTH1qdn9GuBRfznyTYI4SFHgLwc5tAUaPg3D3nG40PJfJym9/UYKclH17Ik 3Z000bx5tQqQ3X44BAHN+ouiPWrCIxAnAhyuV84852bPPom4VcEvUcHW0tCvgy/Rjt mUMWTgAJQE/QCGPd13dJmPsp6B453caUzkHzXEc5Zdolp3pFMGG8UYDMXGluTpnoxx t+Z5TRjLYCSqA== From: "Anthony PERARD" Subject: =?utf-8?q?=5BXEN_PATCH_3/3=5D_CI=3A_New_stage_=22containers=22_to_r?= =?utf-8?q?ebuild_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: 1731690462962 To: xen-devel@lists.xenproject.org Cc: "Andrew Cooper" , "Anthony PERARD" , "Doug Goldstein" , "Stefano Stabellini" Message-Id: <20241115170739.48983-4-anthony.perard@vates.tech> In-Reply-To: <20241115170739.48983-1-anthony.perard@vates.tech> References: <20241115170739.48983-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=2E5cbf7a7fed934b029d368e370fa901a3?= X-Mandrill-User: md_30504962 Feedback-ID: 30504962:30504962.20241115:md Date: Fri, 15 Nov 2024 17:07:43 +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. When $XEN_CI_REBUILD_CONTAINERS is set, only build jobs related to the containers been rebuild will be executed. Build jobs that are using one of the containers been rebuild should wait for the container to be rebuild. If it's a normal pipeline, those dependency are simply ignored. Signed-off-by: Anthony PERARD --- .gitlab-ci.yml | 2 + automation/gitlab-ci/build.yaml | 57 ++++++++++++++++++---------- automation/gitlab-ci/containers.yaml | 29 ++++++++++++++ automation/gitlab-ci/test.yaml | 13 +++++++ 4 files changed, 81 insertions(+), 20 deletions(-) create mode 100644 automation/gitlab-ci/containers.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 941e5822e8..dab9171086 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,11 +8,13 @@ workflow: - when: always stages: + - containers - analyze - build - test include: + - 'automation/gitlab-ci/containers.yaml' - 'automation/gitlab-ci/analyze.yaml' - 'automation/gitlab-ci/build.yaml' - 'automation/gitlab-ci/test.yaml' diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 1ca6764225..e01eec1423 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -3,6 +3,9 @@ image: ${XEN_REGISTRY}/${CONTAINER} script: - ./automation/scripts/build 2>&1 | tee build.log + rules: + - if: $XEN_CI_REBUILD_CONTAINERS && $XEN_CI_RUN_AFTER_CONTAINER_BUILD + - if: $XEN_CI_REBUILD_CONTAINERS == null artifacts: paths: - binaries/ @@ -255,6 +258,8 @@ .test-jobs-artifact-common: stage: build needs: [] + rules: + - if: $XEN_CI_REBUILD_CONTAINERS == null # Arm test artifacts @@ -516,17 +521,24 @@ alpine-3.18-clang-debug: variables: CONTAINER: alpine:3.18 -archlinux-gcc: - extends: .gcc-x86-64-build +.container-archlinux-current: variables: CONTAINER: archlinux:current + XEN_CI_RUN_AFTER_CONTAINER_BUILD: true + needs: + - job: container-archlinux-current + optional: true allow_failure: true +archlinux-gcc: + extends: + - .gcc-x86-64-build + - .container-archlinux-current + archlinux-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: archlinux:current - allow_failure: true + extends: + - .gcc-x86-64-build-debug + - .container-archlinux-current centos-7-gcc: extends: .gcc-x86-64-build @@ -657,29 +669,34 @@ opensuse-leap-15.6-gcc-debug: variables: CONTAINER: opensuse:leap-15.6-x86_64 -opensuse-tumbleweed-clang: - extends: .clang-x86-64-build +.container-opensuse-tumbleweed-x86_64: variables: CONTAINER: opensuse:tumbleweed-x86_64 + XEN_CI_RUN_AFTER_CONTAINER_BUILD: true + needs: + - job: container-opensuse-tumbleweed-x86_64 + optional: true allow_failure: true +opensuse-tumbleweed-clang: + extends: + - .clang-x86-64-build + - .container-opensuse-tumbleweed-x86_64 + opensuse-tumbleweed-clang-debug: - extends: .clang-x86-64-build-debug - variables: - CONTAINER: opensuse:tumbleweed-x86_64 - allow_failure: true + extends: + - .clang-x86-64-build-debug + - .container-opensuse-tumbleweed-x86_64 opensuse-tumbleweed-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: opensuse:tumbleweed-x86_64 - allow_failure: true + extends: + - .gcc-x86-64-build + - .container-opensuse-tumbleweed-x86_64 opensuse-tumbleweed-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: opensuse:tumbleweed-x86_64 - allow_failure: true + extends: + - .gcc-x86-64-build-debug + - .container-opensuse-tumbleweed-x86_64 # PowerPC builds (x86 cross) debian-11-ppc64le-gcc: 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" diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 1822e3ea5f..e4d4f1f3c9 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -1,6 +1,16 @@ +.test-rules: + # Only add rules which prevent jobs from been added to the pipeline. They + # should all have "when: never". + pre_rules: + - if: $XEN_CI_REBUILD_CONTAINERS + when: never + .test-jobs-common: stage: test image: ${XEN_REGISTRY}/${CONTAINER} + rules: + - !reference [.test-rules, pre_rules] + - when: always .arm64-test-needs: &arm64-test-needs - alpine-3.18-arm64-rootfs-export @@ -99,6 +109,7 @@ - '*.dtb' when: always rules: + - !reference [.test-rules, pre_rules] - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -117,6 +128,7 @@ - '*.log' when: always rules: + - !reference [.test-rules, pre_rules] - if: $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - xilinx @@ -136,6 +148,7 @@ - '*.log' when: always rules: + - !reference [.test-rules, pre_rules] - if: $QUBES_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true" tags: - qubes-hw2