gitlab CI: drop Fedora 30

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 36f1c85b1e8064efd8ef6d5e9cf47e2f7151b5dd)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71573370a1796625b96e37b313ad3324b0c2bb13..780ac17e1a2c203db5200720e5b7bd007c2566bc 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -202,17 +202,6 @@ fedora:32@qemu-prep:
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_QEMU_RPMS
   allow_failure: true
 
-fedora:30@container-prep:
-  extends:
-    - .fdo.container-build@fedora
-    - .policy
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '30'
-    FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-
 fedora:31@container-prep:
   extends:
     - .fdo.container-build@fedora
@@ -355,16 +344,6 @@ freebsd:11.2@container-prep:
   only:
     - schedules
 
-fedora:30@container-clean:
-  extends:
-    - .container-clean
-  variables:
-    GIT_STRATEGY: none
-    FEDORA_VERSION: '30'
-    CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '30'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-
 fedora:31@container-clean:
   extends:
     - .container-clean
@@ -807,18 +786,6 @@ coverity:
 #                                                               #
 #################################################################
 
-fedora:30@default-build:
-  stage: distro
-  extends:
-    - .build@template
-    - .fdo.distribution-image@fedora
-  variables:
-    FDO_DISTRIBUTION_VERSION: '30'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-  needs:
-    - "fedora:30@container-prep"
-
-
 fedora:31@default-build:
   stage: distro
   extends:

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 7e8acf5e2b9065dbb553ecaee04d093d596f521b..36d1d049e07a918d52d0a57fa8a41f38b2ef1879 100644 (file)
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -9,7 +9,6 @@ distributions:
   - name: fedora
     tag: *default_tag
     versions:
-      - '30'
       - '31'
       - '32'
     want_qemu: true