diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 881173f..38d141d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,6 +88,24 @@ upload/epel/7: ################################### # Fedora ################################### +build/fedora/35: + <<: *build + variables: + DOCKER_IMAGE: fedora/35 + RPM_BUILD_NCPUS: '1' + +test/fedora/35: + <<: *test + variables: + DOCKER_IMAGE: fedora/35 + dependencies: + - build/fedora/35 + +upload/fedora/35: + <<: *upload + dependencies: + - build/fedora/35 + build/fedora/34: <<: *build variables: @@ -106,24 +124,6 @@ upload/fedora/34: dependencies: - build/fedora/34 -build/fedora/33: - <<: *build - variables: - DOCKER_IMAGE: fedora/33 - RPM_BUILD_NCPUS: '1' - -test/fedora/33: - <<: *test - variables: - DOCKER_IMAGE: fedora/33 - dependencies: - - build/fedora/33 - -upload/fedora/33: - <<: *upload - dependencies: - - build/fedora/33 - ################################### # SLES ################################### @@ -144,23 +144,6 @@ upload/SUSE/15.3: dependencies: - build/sles/15.3 -build/sles/15.2: - <<: *build - variables: - DOCKER_IMAGE: sles/15.2 - -test/sles/15.2: - <<: *test - variables: - DOCKER_IMAGE: sles/15.2 - dependencies: - - build/sles/15.2 - -upload/SUSE/15.2: - <<: *upload - dependencies: - - build/sles/15.2 - build/sles/12.5: <<: *build variables: @@ -197,20 +180,3 @@ upload/openSUSE/15.3: <<: *upload dependencies: - build/opensuse/15.3 - -build/opensuse/15.2: - <<: *build - variables: - DOCKER_IMAGE: opensuse/15.2 - -test/opensuse/15.2: - <<: *test - variables: - DOCKER_IMAGE: opensuse/15.2 - dependencies: - - build/opensuse/15.2 - -upload/openSUSE/15.2: - <<: *upload - dependencies: - - build/opensuse/15.2