mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-21 13:15:25 +00:00
ci: Update with newer lcitool
This switches to newer freebsd 14.1 and implements the new RUN_PIPELINE behaviour introduced by Daniel. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
parent
d88ebd4374
commit
309c5cd4a3
@ -10,7 +10,7 @@ CROSS_PKGS=''
|
||||
MAKE='/usr/local/bin/gmake'
|
||||
NINJA='/usr/local/bin/ninja'
|
||||
PACKAGING_COMMAND='pkg'
|
||||
PIP3='/usr/local/bin/pip-3.8'
|
||||
PIP3='/usr/local/bin/pip'
|
||||
PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline'
|
||||
PYPI_PKGS=''
|
||||
PYTHON='/usr/local/bin/python3'
|
||||
|
@ -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=RUN_PIPELINE=1"
|
||||
# $ git config --local alias.push-ci "push -o ci.variable=RUN_PIPELINE=0"
|
||||
# $ git config --local alias.push-ci-now "push -o ci.variable=RUN_PIPELINE=1"
|
||||
#
|
||||
# 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
|
||||
|
@ -47,19 +47,27 @@
|
||||
when: on_success
|
||||
|
||||
# forks: pushes to a branch when a pipeline run in upstream env is explicitly requested
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "0"'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1" && $JOB_OPTIONAL'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1"'
|
||||
when: on_success
|
||||
|
||||
# forks: pushes to branches with pipeline requested
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "0"'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
variables:
|
||||
IMAGE: $TARGET_BASE_IMAGE
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1" && $JOB_OPTIONAL'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
variables:
|
||||
IMAGE: $TARGET_BASE_IMAGE
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1"'
|
||||
when: on_success
|
||||
variables:
|
||||
IMAGE: $TARGET_BASE_IMAGE
|
||||
@ -183,19 +191,27 @@
|
||||
when: on_success
|
||||
|
||||
# forks: pushes to a branch when a pipeline run in upstream env is explicitly requested
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "0"'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1" && $JOB_OPTIONAL'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1"'
|
||||
when: on_success
|
||||
|
||||
# forks: pushes to branches with pipeline requested
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "0"'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
variables:
|
||||
IMAGE: $TARGET_BASE_IMAGE
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1" && $JOB_OPTIONAL'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
variables:
|
||||
IMAGE: $TARGET_BASE_IMAGE
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1"'
|
||||
when: on_success
|
||||
variables:
|
||||
IMAGE: $TARGET_BASE_IMAGE
|
||||
@ -302,15 +318,21 @@
|
||||
when: on_success
|
||||
|
||||
# forks: pushes to branches with pipeline requested (including pipeline in upstream environment)
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "0"'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1" && $JOB_OPTIONAL'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1"'
|
||||
when: on_success
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "0"'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1" && $JOB_OPTIONAL'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1"'
|
||||
when: on_success
|
||||
|
||||
# upstream+forks: Run pipelines on MR, web, api & scheduled
|
||||
|
@ -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
|
||||
|
@ -18,9 +18,13 @@ check-dco:
|
||||
when: on_success
|
||||
|
||||
# forks: pushes to branches with pipeline requested (including upstream env pipelines)
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE == "0"'
|
||||
when: manual
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE == "1"'
|
||||
when: on_success
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV'
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV == "0"'
|
||||
when: manual
|
||||
- if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV == "1"'
|
||||
when: on_success
|
||||
|
||||
# upstream+forks: that's all folks
|
||||
|
Loading…
Reference in New Issue
Block a user