diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a8387d7e5..6b053de287 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-07-12.0-f3bd83023528' - UBUNTU_TAG: '2021-07-12.0-ceca385e1904' - DEBIAN_TAG: '2021-07-12.0-ceca385e1904' - CENTOS_TAG: '2021-07-12.0-f3bd83023528' - ALPINE_TAG: '2021-07-12.0-a623f8d1b2f8' + FEDORA_TAG: '2021-07-12.0-ce2fde13c082' + UBUNTU_TAG: '2021-07-12.0-03cf2b545306' + DEBIAN_TAG: '2021-07-12.0-03cf2b545306' + CENTOS_TAG: '2021-07-12.0-ce2fde13c082' + ALPINE_TAG: '2021-07-12.0-deabecd7cba6' 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 @@ -368,24 +348,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 @@ -613,28 +575,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 dc7cdbcec6..f8bb9404d0 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'