ci: Refresh and add Fedora 37 target

Signed-off-by: Erik Skultety <eskultet@redhat.com>
2024-10-26 07:55:06 +03:00 · 2023-01-04 15:06:09 +01:00 · 2023-01-04 15:06:09 +01:00 · 6e0d4d53d5
commit 6e0d4d53d5
parent deabf3d88c
9 changed files with 41 additions and 68 deletions
--- a/ci/buildenv/fedora-37.sh
+++ b/ci/buildenv/fedora-37.sh
--- a/ci/containers/fedora-37.Dockerfile
+++ b/ci/containers/fedora-37.Dockerfile
@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci

-FROM registry.fedoraproject.org/fedora:35
+FROM registry.fedoraproject.org/fedora:37

 RUN dnf install -y nosync && \
    echo -e '#!/bin/sh\n\
--- 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
--- 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-python/ci-$NAME:latest
  stage: builds
+  interruptible: true
  before_script:
    - cat /packages.txt
  rules:
@ -36,14 +37,14 @@
    - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
      when: on_success

-    # upstream: other web/api/scheduled pipelines targetting the default branch
+    # upstream: other web/api/scheduled pipelines targeting the default branch
    - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL'
      when: manual
      allow_failure: true
    - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH'
      when: on_success

-    # upstream+forks: merge requests targetting the default branch, without CI changes
+    # upstream+forks: merge requests targeting the default branch, without CI changes
    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $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 != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE'
      when: on_success

-    # upstream: other web/api/scheduled pipelines targetting non-default branches
+    # upstream: other web/api/scheduled pipelines targeting non-default branches
    - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $JOB_OPTIONAL'
      when: manual
      allow_failure: true
@ -93,7 +95,7 @@
    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/'
      when: on_success

-    # upstream+forks: merge requests targetting the default branch, with CI changes
+    # upstream+forks: merge requests targeting the default branch, with CI changes
    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL'
      changes:
        - ci/gitlab/container-templates.yml
@ -106,7 +108,7 @@
        - ci/containers/$NAME.Dockerfile
      when: on_success

-    # upstream+forks: merge requests targetting non-default branches
+    # upstream+forks: merge requests targeting non-default branches
    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH && $JOB_OPTIONAL'
      when: manual
      allow_failure: true
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@ -15,10 +15,6 @@ x86_64-centos-stream-8-prebuilt-env:
  allow_failure: false
  variables:
    NAME: centos-stream-8
-  artifacts:
-    expire_in: 1 hour
-    paths:
-      - libvirt-python-rpms

 x86_64-centos-stream-8-local-env:
  extends: .native_build_job_local_env
@ -27,10 +23,6 @@ x86_64-centos-stream-8-local-env:
  variables:
    IMAGE: quay.io/centos/centos:stream8
    NAME: centos-stream-8
-  artifacts:
-    expire_in: 1 hour
-    paths:
-      - libvirt-python-rpms


 x86_64-centos-stream-8-git-prebuilt-env:
@ -69,10 +61,6 @@ x86_64-centos-stream-9-prebuilt-env:
  allow_failure: false
  variables:
    NAME: centos-stream-9
-  artifacts:
-    expire_in: 1 hour
-    paths:
-      - libvirt-python-rpms

 x86_64-centos-stream-9-local-env:
  extends: .native_build_job_local_env
@ -81,10 +69,6 @@ x86_64-centos-stream-9-local-env:
  variables:
    IMAGE: quay.io/centos/centos:stream9
    NAME: centos-stream-9
-  artifacts:
-    expire_in: 1 hour
-    paths:
-      - libvirt-python-rpms


 x86_64-debian-10-prebuilt-env:
@ -123,32 +107,6 @@ x86_64-debian-sid-local-env:
    NAME: debian-sid


-x86_64-fedora-35-prebuilt-env:
-  extends: .native_build_job_prebuilt_env
-  needs:
-    - job: x86_64-fedora-35-container
-      optional: true
-  allow_failure: false
-  variables:
-    NAME: fedora-35
-  artifacts:
-    expire_in: 1 hour
-    paths:
-      - libvirt-python-rpms
-
-x86_64-fedora-35-local-env:
-  extends: .native_build_job_local_env
-  needs: []
-  allow_failure: false
-  variables:
-    IMAGE: registry.fedoraproject.org/fedora:35
-    NAME: fedora-35
-  artifacts:
-    expire_in: 1 hour
-    paths:
-      - libvirt-python-rpms
-
-
 x86_64-fedora-36-prebuilt-env:
  extends: .native_build_job_prebuilt_env
  needs:
@ -157,10 +115,6 @@ x86_64-fedora-36-prebuilt-env:
  allow_failure: false
  variables:
    NAME: fedora-36
-  artifacts:
-    expire_in: 1 hour
-    paths:
-      - libvirt-python-rpms

 x86_64-fedora-36-local-env:
  extends: .native_build_job_local_env
@ -169,10 +123,24 @@ x86_64-fedora-36-local-env:
  variables:
    IMAGE: registry.fedoraproject.org/fedora:36
    NAME: fedora-36
-  artifacts:
-    expire_in: 1 hour
-    paths:
-      - libvirt-python-rpms
+
+
+x86_64-fedora-37-prebuilt-env:
+  extends: .native_build_job_prebuilt_env
+  needs:
+    - job: x86_64-fedora-37-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: fedora-37
+
+x86_64-fedora-37-local-env:
+  extends: .native_build_job_local_env
+  needs: []
+  allow_failure: false
+  variables:
+    IMAGE: registry.fedoraproject.org/fedora:37
+    NAME: fedora-37


 x86_64-fedora-rawhide-prebuilt-env:
--- 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
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@ -35,13 +35,6 @@ x86_64-debian-sid-container:
    NAME: debian-sid


-x86_64-fedora-35-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-35
-
-
 x86_64-fedora-36-container:
  extends: .container_job
  allow_failure: false
@ -49,6 +42,13 @@ x86_64-fedora-36-container:
    NAME: fedora-36


+x86_64-fedora-37-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-37
+
+
 x86_64-fedora-rawhide-container:
  extends: .container_job
  allow_failure: false
--- 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:
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@ -31,10 +31,10 @@ targets:

  debian-sid: x86_64

-  fedora-35: x86_64
-
  fedora-36: x86_64

+  fedora-37: x86_64
+
  fedora-rawhide: x86_64

  opensuse-leap-153: