From nobody Thu Nov 21 12:54:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 173139899010142.518164421846336; Tue, 12 Nov 2024 00:09:50 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id B2F591912; Tue, 12 Nov 2024 03:09:48 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BB11118BB; Tue, 12 Nov 2024 03:09:15 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A5D9918A7; Tue, 12 Nov 2024 03:09:13 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E55E6189C for ; Tue, 12 Nov 2024 03:09:12 -0500 (EST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-576-TCO4C2TxN6mxN1ViLLPMHg-1; Tue, 12 Nov 2024 03:09:10 -0500 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4315e8e9b1cso30467145e9.1 for ; Tue, 12 Nov 2024 00:09:10 -0800 (PST) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381ed987d95sm14890008f8f.44.2024.11.12.00.09.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 00:09:08 -0800 (PST) Received: from wheatley.brq.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 607B63C055F2 for ; Tue, 12 Nov 2024 09:09:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731398952; h=from:from: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; bh=qZHLRGUKe09p7WdhkS4px8qZDq4c1eb9Q8YK/3nsvyM=; b=MK+aY3IWpmbwcCiSk7djLls4Sq7f0gYpmhkHXn7/XVQI3z3/sds152tUeM3z23XpH6L5p9 AaK1qLuWlntDsGUKdja/KJcgKCS1TpASmOk7Z8E9PahqOAFsdHKw5OgUOvvU1TgcgxHJBR nPAo7qmMCeF8MFGcSXsUxjHCWXStX6I= X-MC-Unique: TCO4C2TxN6mxN1ViLLPMHg-1 X-Mimecast-MFC-AGG-ID: TCO4C2TxN6mxN1ViLLPMHg X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731398949; x=1732003749; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qZHLRGUKe09p7WdhkS4px8qZDq4c1eb9Q8YK/3nsvyM=; b=kdIOANtjpz09PEgQPyslljhAtQp4h2qGst9usaRueQ5o898kL/x2E86Hiv29buRCWV degZgo6etgII6J1SHTU3/YlTY5AU86Y/iw5JuuceRwBddEbzFcLtPl0eBKR2Aki+spUl hJE3oGlbPGzC99stV09zwjK/WjUlI4ESihVi0hNYdayvjZc/mt1Z9Hh6yaXUgCYKB5bl NGJkyxtQO8p59q8Qe0YotOE1+76aYOzj4tX0GYxH9Tn3aR7x7EPilAMqiBv/r/v+l0A+ oEs6lWlFg8cWwyQMQSyP/N/MdRxJd6hVweRszVrh8kGYLePpOUdMFSXWk9WV3pcdXn9f +E3Q== X-Gm-Message-State: AOJu0Yxqdo62/XAdxK4MDKsHG95OmqH/jqbBlrcAwYceLmwxDaoWV2E/ Z9dRA2TdpULx8sLEvcs58KvT0k7hJUlyJcDdVBSzByo5mYErXpHII+NlYXtkYg4wq3CvBn4zA3j h57KpvxiULs/+n9Eud3mfD6PUIlqWT62K1txflJMQ0+Maqg8LAWCpadEW46YQ8qWVrfY7CDVNNi /u0YJ4y29+496g+Mt4F2Cukg75IIe3T6xb3FAAONc= X-Received: by 2002:a05:600c:5105:b0:431:15f1:421d with SMTP id 5b1f17b1804b1-432b6875ea2mr130776635e9.16.1731398949628; Tue, 12 Nov 2024 00:09:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IGfMIRi9ajfFh/gM5gBlFGDq10NdwHMYoRkBudguSWgYsmA85wbqwC8+bmSSPin6YiEeR6pNg== X-Received: by 2002:a05:600c:5105:b0:431:15f1:421d with SMTP id 5b1f17b1804b1-432b6875ea2mr130776285e9.16.1731398949099; Tue, 12 Nov 2024 00:09:09 -0800 (PST) From: Martin Kletzander To: devel@lists.libvirt.org Subject: [PATCH] ci: Update with newer lcitool Date: Tue, 12 Nov 2024 09:05:38 +0100 Message-ID: <52936b54f1a291674dc4708bdf3244a3b2a74e1d.1731398738.git.mkletzan@redhat.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: fjHZpg8QIHanWPNR2qnZ9IxL6XnbSgO8OKTFu869sSw_1731398950 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: D3VCJHXOPQB6GZFI7NWB235QS5ISVJ3T X-Message-ID-Hash: D3VCJHXOPQB6GZFI7NWB235QS5ISVJ3T X-MailFrom: mkletzan@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1731398990884116600 Content-Type: text/plain; charset="utf-8"; x-default="true" This switches to newer freebsd 14.1 and implements the new RUN_PIPELINE behaviour introduced by Daniel. Signed-off-by: Martin Kletzander Reviewed-by: Jiri Denemark --- As far as I understand this does not need any change in the CI/CD settings = in gitlab, but I do not have access to those. ci/cirrus/freebsd-14.vars | 2 +- ci/gitlab.yml | 13 +++++++--- ci/gitlab/build-templates.yml | 46 ++++++++++++++++++++++++++--------- ci/gitlab/builds.yml | 2 +- ci/gitlab/sanity-checks.yml | 8 ++++-- 5 files changed, 51 insertions(+), 20 deletions(-) diff --git a/ci/cirrus/freebsd-14.vars b/ci/cirrus/freebsd-14.vars index fbcd6130956f..3002987cbdd8 100644 --- a/ci/cirrus/freebsd-14.vars +++ b/ci/cirrus/freebsd-14.vars @@ -10,7 +10,7 @@ CROSS_PKGS=3D'' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' -PIP3=3D'/usr/local/bin/pip-3.8' +PIP3=3D'/usr/local/bin/pip' PKGS=3D'augeas bash-completion ca_root_nss ccache codespell cppi curl cyru= s-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed jso= n-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 p= kgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 = qemu readline' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 7bb68b848c73..0daab1267668 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -11,8 +11,11 @@ # - RUN_PIPELINE - force creation of a CI pipeline when # pushing to a branch in a forked repository. Official # CI pipelines are triggered when merge requests are -# created/updated. Setting this variable to a non-empty -# value allows CI testing prior to opening a merge request. +# created/updated. Setting this variable allows CI +# testing prior to opening a merge request. A value +# of "0" will create the pipeline but leave all jobs +# to be manually started, while "1" will immediately +# run all default jobs. # # - RUN_PIPELINE_UPSTREAM_ENV - same semantics as RUN_PIPELINE, # but uses the CI environment (containers) from the upstream project @@ -38,11 +41,13 @@ # # Aliases can be set for common usage # -# $ git config --local alias.push-ci "push -o ci.variable=3DRUN_PIPELINE= =3D1" +# $ git config --local alias.push-ci "push -o ci.variable=3DRUN_PIPELINE= =3D0" +# $ git config --local alias.push-ci-now "push -o ci.variable=3DRUN_PIPEL= INE=3D1" # # Allowing the less verbose invocation # -# $ git push-ci +# $ git push-ci (create pipeline but don't start jobs) +# $ git push-ci-now (create pipeline and start default jobs) # # Pipeline variables can also be set in the repository # pipeline config globally, or set against scheduled pipelines diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index b1e41b0783d9..5ba91ffc673d 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -47,19 +47,27 @@ when: on_success =20 # forks: pushes to a branch when a pipeline run in upstream env is exp= licitly requested - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "0"' when: manual allow_failure: true - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "1" && $JOB_O= PTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "1"' when: on_success =20 # forks: pushes to branches with pipeline requested - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "0"' + when: manual + allow_failure: true + variables: + IMAGE: $TARGET_BASE_IMAGE + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "1" && $JOB_OPTIONAL' when: manual allow_failure: true variables: IMAGE: $TARGET_BASE_IMAGE - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "1"' when: on_success variables: IMAGE: $TARGET_BASE_IMAGE @@ -183,19 +191,27 @@ when: on_success =20 # forks: pushes to a branch when a pipeline run in upstream env is exp= licitly requested - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "0"' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "1" && $JOB_O= PTIONAL' when: manual allow_failure: true - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "1"' when: on_success =20 # forks: pushes to branches with pipeline requested - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "0"' when: manual allow_failure: true variables: IMAGE: $TARGET_BASE_IMAGE - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "1" && $JOB_OPTIONAL' + when: manual + allow_failure: true + variables: + IMAGE: $TARGET_BASE_IMAGE + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "1"' when: on_success variables: IMAGE: $TARGET_BASE_IMAGE @@ -302,15 +318,21 @@ when: on_success =20 # forks: pushes to branches with pipeline requested (including pipelin= e in upstream environment) - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "0"' when: manual allow_failure: true - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "1" && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE =3D=3D "1"' when: on_success - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "0"' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "1" && $JOB_O= PTIONAL' when: manual allow_failure: true - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $RUN_PIPELINE_UPSTREAM_ENV =3D=3D "1"' when: on_success =20 # upstream+forks: Run pipelines on MR, web, api & scheduled diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index c24421378c51..3e7f36802e15 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -617,7 +617,7 @@ x86_64-freebsd-14: allow_failure: exit_codes: 3 variables: - CIRRUS_VM_IMAGE_NAME: freebsd-14-0 + CIRRUS_VM_IMAGE_NAME: freebsd-14-1 CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_INSTANCE_TYPE: freebsd_instance INSTALL_COMMAND: pkg install -y diff --git a/ci/gitlab/sanity-checks.yml b/ci/gitlab/sanity-checks.yml index d2b1768e266d..b568015db930 100644 --- a/ci/gitlab/sanity-checks.yml +++ b/ci/gitlab/sanity-checks.yml @@ -18,9 +18,13 @@ check-dco: when: on_success =20 # forks: pushes to branches with pipeline requested (including upstrea= m env pipelines) - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE =3D=3D "0"' + when: manual + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE =3D=3D "1"' when: on_success - - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV' + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV= =3D=3D "0"' + when: manual + - if: '$CI_PROJECT_NAMESPACE !=3D $RUN_UPSTREAM_NAMESPACE && $CI_PIPEL= INE_SOURCE =3D=3D "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV= =3D=3D "1"' when: on_success =20 # upstream+forks: that's all folks --=20 2.47.0