From nobody Fri Apr 26 22:10:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1668427563; cv=none; d=zohomail.com; s=zohoarc; b=CBzdS4sjp7vl+rkbHuKkidHDdWQewW6P+tWwN8PNIpXn5PZvtdMKZTvo/z3r/UpAHgOtVHDtrV67d+IKOITUvfzoKLapG7y2eyznWmNWuLREFLQcyLWHGRkItGYWDRPmIUqaHKvZWCefnBKqlStpWR4q1et9Gw9howHdEbPXPLM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668427563; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=VVc6KklN1ES2MR7H1ICnJhMBZ5KFLNufaeT1PNVqWBk=; b=QJaNu3c6KNthmPIuVwKde7Tip71DpSi783w3hwZOWmlnBnE5HGfXd8c7u3J6KT6K8EqQr+3jiXg2dPCm0xbSVM+O165qLXOV3g7pQi/2b3ihKcQVZfB6AaRMQvCxr8Py7bmja/A5S/PQvAb61H+2hqrn+MTiTYMcphk3o65qBG4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 16684275636413.764550136522189; Mon, 14 Nov 2022 04:06:03 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-620-pjDywmHEOWqREW-a72gd8g-1; Mon, 14 Nov 2022 07:05:59 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B29FF811E67; Mon, 14 Nov 2022 12:05:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2AC72166B2B; Mon, 14 Nov 2022 12:05:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DD32F194658C; Mon, 14 Nov 2022 12:05:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AC38B1946589 for ; Mon, 14 Nov 2022 12:05:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8FB5E111F3CB; Mon, 14 Nov 2022 12:05:52 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE0F0112132E; Mon, 14 Nov 2022 12:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668427562; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VVc6KklN1ES2MR7H1ICnJhMBZ5KFLNufaeT1PNVqWBk=; b=XIds5ySfmBIcHUIPOXibAA520t+Ue0YoN4/KuLoj98NBqWXa4roJoe9t0EUVxdqqgJDJIN 2ekVggyj6TjuoAmjBM7s8pf9dMBraM7LqztZm/MQ98q+Uj+QBCDp8QZE803EPt5Bx0pTpM GzkUeiDOXPnwo80SpRlEXuZSHyh0/5g= X-MC-Unique: pjDywmHEOWqREW-a72gd8g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH] ci: regenerate with lcitool manifest Date: Mon, 14 Nov 2022 12:05:48 +0000 Message-Id: <20221114120548.185010-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1668427565018100001 Two notable changes: * the macOS platform has switched from x86_64 to aarch64 * if a new pipeline starts before a previous one finishes, jobs marked 'interruptible: true' will be auto-cancelled Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- NB: the macOS changes are pending on approval of: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/333 ci/gitlab.yml | 1 + ci/gitlab/build-templates.yml | 37 ++++++++++++++++++------------- ci/gitlab/builds.yml | 6 ++--- ci/gitlab/container-templates.yml | 1 + ci/gitlab/sanity-checks.yml | 1 + ci/manifest.yml | 2 +- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/ci/gitlab.yml b/ci/gitlab.yml index bdc5e0a96f..3866dcf545 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -67,6 +67,7 @@ workflow: debug: image: docker.io/library/alpine:3 stage: sanity_checks + interruptible: true needs: [] script: - printenv | sort diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 5d7d6c59c5..259cf2b173 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -9,14 +9,14 @@ # We use pre-built containers for any pipelines that are: # # - Validating code committed on default upstream branch -# - Validating patches targetting default upstream branch +# - Validating patches targeting default upstream branch # which do not have CI changes # # We use a local build env for any pipelines that are: # # - Validating code committed to a non-default upstream branch -# - Validating patches targetting a non-default upstream branch -# - Validating patches targetting default upstream branch which +# - Validating patches targeting a non-default upstream branch +# - Validating patches targeting default upstream branch which # include CI changes # - Validating code committed to a fork branch # @@ -26,6 +26,7 @@ .gitlab_native_build_job_prebuilt_env: image: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest stage: builds + interruptible: true before_script: - cat /packages.txt rules: @@ -36,14 +37,14 @@ - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D=3D "push" && $CI_COMMIT_BRANCH =3D=3D $CI_DEFAULT_BRANCH' when: on_success =20 - # upstream: other web/api/scheduled pipelines targetting the default b= ranch + # upstream: other web/api/scheduled pipelines targeting the default br= anch - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME =3D=3D $CI_DE= FAULT_BRANCH && $JOB_OPTIONAL' when: manual allow_failure: true - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME =3D=3D $CI_DE= FAULT_BRANCH' when: on_success =20 - # upstream+forks: merge requests targetting the default branch, withou= t CI changes + # upstream+forks: merge requests targeting the default branch, without= CI changes - if: '$CI_PIPELINE_SOURCE =3D=3D "merge_request_event" && $CI_MERGE_R= EQUEST_TARGET_BRANCH_NAME =3D=3D $CI_DEFAULT_BRANCH' changes: - ci/gitlab/container-templates.yml @@ -61,6 +62,7 @@ .gitlab_native_build_job_local_env: image: $IMAGE stage: builds + interruptible: true before_script: - source ci/buildenv/$NAME.sh - install_buildenv @@ -79,7 +81,7 @@ - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE' when: on_success =20 - # upstream: other web/api/scheduled pipelines targetting non-default b= ranches + # upstream: other web/api/scheduled pipelines targeting non-default br= anches - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME !=3D $CI_DEFA= ULT_BRANCH && $JOB_OPTIONAL' when: manual allow_failure: true @@ -93,7 +95,7 @@ - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D~ /(web|api|schedule)/' when: on_success =20 - # upstream+forks: merge requests targetting the default branch, with C= I changes + # upstream+forks: merge requests targeting the default branch, with CI= changes - if: '$CI_PIPELINE_SOURCE =3D=3D "merge_request_event" && $CI_MERGE_R= EQUEST_TARGET_BRANCH_NAME =3D=3D $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' changes: - ci/gitlab/container-templates.yml @@ -106,7 +108,7 @@ - ci/containers/$NAME.Dockerfile when: on_success =20 - # upstream+forks: merge requests targetting non-default branches + # upstream+forks: merge requests targeting non-default branches - if: '$CI_PIPELINE_SOURCE =3D=3D "merge_request_event" && $CI_MERGE_R= EQUEST_TARGET_BRANCH_NAME !=3D $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' when: manual allow_failure: true @@ -121,14 +123,14 @@ # We use pre-built containers for any pipelines that are: # # - Validating code committed on default upstream branch -# - Validating patches targetting default upstream branch +# - Validating patches targeting default upstream branch # which do not have CI changes # # We use a local build env for any pipelines that are: # # - Validating code committed to a non-default upstream branch -# - Validating patches targetting a non-default upstream branch -# - Validating patches targetting default upstream branch which +# - Validating patches targeting a non-default upstream branch +# - Validating patches targeting default upstream branch which # include CI changes # - Validating code committed to a fork branch # @@ -138,6 +140,7 @@ .gitlab_cross_build_job_prebuilt_env: image: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROS= S:latest stage: builds + interruptible: true before_script: - cat /packages.txt rules: @@ -148,14 +151,14 @@ - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D=3D "push" && $CI_COMMIT_BRANCH =3D=3D $CI_DEFAULT_BRANCH' when: on_success =20 - # upstream: other web/api/scheduled pipelines targetting the default b= ranch + # upstream: other web/api/scheduled pipelines targeting the default br= anch - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME =3D=3D $CI_DE= FAULT_BRANCH && $JOB_OPTIONAL' when: manual allow_failure: true - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME =3D=3D $CI_DE= FAULT_BRANCH' when: on_success =20 - # upstream+forks: merge requests targetting the default branch, withou= t CI changes + # upstream+forks: merge requests targeting the default branch, without= CI changes - if: '$CI_PIPELINE_SOURCE =3D=3D "merge_request_event" && $CI_MERGE_R= EQUEST_TARGET_BRANCH_NAME =3D=3D $CI_DEFAULT_BRANCH' changes: - ci/gitlab/container-templates.yml @@ -173,6 +176,7 @@ .gitlab_cross_build_job_local_env: image: $IMAGE stage: builds + interruptible: true before_script: - source ci/buildenv/$NAME.sh - install_buildenv @@ -191,7 +195,7 @@ - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE' when: on_success =20 - # upstream: other web/api/scheduled pipelines targetting non-default b= ranches + # upstream: other web/api/scheduled pipelines targeting non-default br= anches - if: '$CI_PROJECT_NAMESPACE =3D=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIP= ELINE_SOURCE =3D~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME !=3D $CI_DEFA= ULT_BRANCH && $JOB_OPTIONAL' when: manual allow_failure: true @@ -205,7 +209,7 @@ - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D~ /(web|api|schedule)/' when: on_success =20 - # upstream+forks: merge requests targetting the default branch, with C= I changes + # upstream+forks: merge requests targeting the default branch, with CI= changes - if: '$CI_PIPELINE_SOURCE =3D=3D "merge_request_event" && $CI_MERGE_R= EQUEST_TARGET_BRANCH_NAME =3D=3D $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' changes: - ci/gitlab/container-templates.yml @@ -218,7 +222,7 @@ - ci/containers/$NAME.Dockerfile when: on_success =20 - # upstream+forks: merge requests targetting non-default branches + # upstream+forks: merge requests targeting non-default branches - if: '$CI_PIPELINE_SOURCE =3D=3D "merge_request_event" && $CI_MERGE_R= EQUEST_TARGET_BRANCH_NAME !=3D $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' when: manual allow_failure: true @@ -232,6 +236,7 @@ .cirrus_build_job: stage: builds image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master + interruptible: true needs: [] script: - source ci/cirrus/$NAME.vars diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index e2f2f39320..0e2daebe97 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -860,14 +860,14 @@ x86_64-freebsd-13: UPGRADE_COMMAND: pkg upgrade -y =20 =20 -x86_64-macos-12: +aarch64-macos-12: extends: .cirrus_build_job needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: monterey-base + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_INSTANCE_TYPE: osx_instance + CIRRUS_VM_INSTANCE_TYPE: macos_instance INSTALL_COMMAND: brew install NAME: macos-12 PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/= usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/= bin diff --git a/ci/gitlab/container-templates.yml b/ci/gitlab/container-templa= tes.yml index a577028d11..edb4aba676 100644 --- a/ci/gitlab/container-templates.yml +++ b/ci/gitlab/container-templates.yml @@ -16,6 +16,7 @@ .container_job: image: docker:stable stage: containers + interruptible: false needs: [] services: - docker:dind diff --git a/ci/gitlab/sanity-checks.yml b/ci/gitlab/sanity-checks.yml index f843c7f708..cdcfb9bf91 100644 --- a/ci/gitlab/sanity-checks.yml +++ b/ci/gitlab/sanity-checks.yml @@ -9,6 +9,7 @@ check-dco: stage: sanity_checks needs: [] image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master + interruptible: true script: - /check-dco "$RUN_UPSTREAM_NAMESPACE" rules: diff --git a/ci/manifest.yml b/ci/manifest.yml index 865a82a4a9..2aec92dd26 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -175,7 +175,7 @@ targets: =20 macos-12: jobs: - - arch: x86_64 + - arch: aarch64 variables: PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext= /bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/r= pcgen/bin PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/op= t/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt= /ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig --=20 2.37.3