gitlab-ci: drop fedora 28/29 from gitlab-ci

These containers are ancient. Also, when we update ci-templates
they will no longer build (because then a different container hub
will be used, which doesn't contain those images). Drop them.

2 files changed, 5 insertions, 67 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22de239b18..a5e97a3cbf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,11 +47,11 @@ variables:
   #
   # This is done by running `ci-fairy generate-template` and possibly bump
   # ".default_tag".
-  FEDORA_TAG:  '2021-08-30.0-cd3afeeac844'
-  UBUNTU_TAG:  '2021-08-30.0-6414c66cfe63'
-  DEBIAN_TAG:  '2021-08-30.0-6414c66cfe63'
-  CENTOS_TAG:  '2021-08-30.0-cd3afeeac844'
-  ALPINE_TAG:  '2021-08-30.0-098c1144d4d6'
+  FEDORA_TAG:  '2021-08-30.0-34fd7cff642b'
+  UBUNTU_TAG:  '2021-08-30.0-391abd1a04e8'
+  DEBIAN_TAG:  '2021-08-30.0-391abd1a04e8'
+  CENTOS_TAG:  '2021-08-30.0-34fd7cff642b'
+  ALPINE_TAG:  '2021-08-30.0-2ea2ced952a4'
 
   FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
   UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
@@ -84,26 +84,6 @@ variables:
 # Build a container for each distribution + version. The ci-templates
 # will re-use the containers if the tag doesn't change.
 
-fedora:28@container-prep:
-  extends:
-    - .fdo.container-build@fedora
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '28'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-    FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-
-fedora:29@container-prep:
-  extends:
-    - .fdo.container-build@fedora
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '29'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-    FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-
 fedora:30@container-prep:
   extends:
     - .fdo.container-build@fedora
@@ -378,24 +358,6 @@ alpine:latest@container-prep:
   only:
     - schedules
 
-fedora:28@container-clean:
-  extends:
-    - .container-clean
-  variables:
-    GIT_STRATEGY: none
-    CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '28'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-
-fedora:29@container-clean:
-  extends:
-    - .container-clean
-  variables:
-    GIT_STRATEGY: none
-    CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '29'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-
 fedora:30@container-clean:
   extends:
     - .container-clean
@@ -632,28 +594,6 @@ alpine:latest@container-clean:
 #################################################################
 
 
-t_fedora:28:
-  extends:
-    - .build@template
-    - .fdo.distribution-image@fedora
-  variables:
-    FDO_DISTRIBUTION_VERSION: '28'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-  needs:
-    - "fedora:28@container-prep"
-  when: manual
-
-t_fedora:29:
-  extends:
-    - .build@template
-    - .fdo.distribution-image@fedora
-  variables:
-    FDO_DISTRIBUTION_VERSION: '29'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-  needs:
-    - "fedora:29@container-prep"
-  when: manual
-
 t_fedora:30:
   extends:
     - .build@template
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index a036c5cd7f..ef383fcd45 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -18,8 +18,6 @@ distributions:
     tag: *default_tag
     base_type: fedora
     versions:
-      - '28'
-      - '29'
       - '30'
       - '31'
       - '32'