From 36f1c85b1e8064efd8ef6d5e9cf47e2f7151b5dd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 20 Aug 2020 14:46:50 +1000 Subject: [PATCH] gitlab CI: drop Fedora 30 Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 33 --------------------------------- .gitlab-ci/config.yml | 1 - 2 files changed, 34 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7157337..780ac17 100644 --- 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 7e8acf5..36d1d04 100644 --- 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 -- 2.7.4