From: Peter Krempa <pkrempa@redhat.com> Cirrus CI no longer exists. Drop the current jobs using it from the definitions. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ci/gitlab/build-templates.yml | 53 ----------------------------------- ci/gitlab/builds.yml | 49 -------------------------------- ci/manifest.yml | 11 -------- 3 files changed, 113 deletions(-) diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index fc5ddc7eb9..cbee6b68f3 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -293,56 +293,3 @@ # upstream+forks: that's all folks - when: never - - -.cirrus_build_job: - stage: builds - image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:latest - interruptible: true - needs: [] - script: - - set -o allexport - - source ci/cirrus/$NAME.vars - - set +o allexport - - cirrus-vars <ci/cirrus/build.yml >ci/cirrus/$NAME.yml - - cat ci/cirrus/$NAME.yml - - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml - rules: - # upstream+forks: Can't run unless Cirrus is configured - - if: '$CIRRUS_GITHUB_REPO == null || $CIRRUS_API_TOKEN == null' - when: never - - # upstream: pushes to branches - - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $JOB_OPTIONAL' - when: manual - allow_failure: true - - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push"' - 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 == "0"' - when: manual - allow_failure: true - - 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 == "0"' - when: manual - allow_failure: true - - 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 - - if: '$CI_PIPELINE_SOURCE =~ /(web|api|schedule|merge_request_event)/ && $JOB_OPTIONAL' - when: manual - allow_failure: true - - if: '$CI_PIPELINE_SOURCE =~ /(web|api|schedule|merge_request_event)/' - when: on_success - - # upstream+forks: that's all folks - - when: never diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index d215b23b7d..30f29df184 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -505,52 +505,3 @@ mingw64-fedora-rawhide: JOB_OPTIONAL: 1 NAME: fedora-rawhide TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:rawhide - - -# Native cirrus build jobs - -x86_64-freebsd-14: - extends: .cirrus_build_job - needs: [] - allow_failure: - exit_codes: 3 - variables: - CIRRUS_VM_IMAGE_NAME: freebsd-14-3 - CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - INSTALL_COMMAND: pkg install -y - NAME: freebsd-14 - UPDATE_COMMAND: pkg update - UPGRADE_COMMAND: pkg upgrade -y - - -x86_64-freebsd-15: - extends: .cirrus_build_job - needs: [] - allow_failure: - exit_codes: 3 - variables: - CIRRUS_VM_IMAGE_NAME: freebsd-15-0-amd64-ufs - CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - INSTALL_COMMAND: pkg install -y - NAME: freebsd-15 - UPDATE_COMMAND: pkg update - UPGRADE_COMMAND: pkg upgrade -y - - -aarch64-macos-14: - extends: .cirrus_build_job - needs: [] - allow_failure: - exit_codes: 3 - variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma - CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_INSTANCE_TYPE: macos_instance - INSTALL_COMMAND: brew install - NAME: macos-14 - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - UPDATE_COMMAND: brew update - UPGRADE_COMMAND: brew upgrade diff --git a/ci/manifest.yml b/ci/manifest.yml index 94639cf0b8..ef04ff9b1a 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -165,10 +165,6 @@ targets: allow-failure: true builds: false - freebsd-14: x86_64 - - freebsd-15: x86_64 - opensuse-leap-15: jobs: - arch: x86_64 @@ -184,13 +180,6 @@ targets: variables: RPM: skip - macos-14: - jobs: - - 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 - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - ubuntu-2404: jobs: - arch: x86_64 -- 2.54.0