From: Peter Hutterer Date: Wed, 3 Aug 2022 03:42:47 +0000 (+1000) Subject: gitlab ci: drop EOL'd ubuntu 21.10 X-Git-Tag: 1.22.0~43 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45db4ceb491824f6bb4ffecb7297cde3cf17d79b;p=platform%2Fupstream%2Flibinput.git gitlab ci: drop EOL'd ubuntu 21.10 Signed-off-by: Peter Hutterer --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58faa7d..886874c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,17 +269,6 @@ debian:stable@container-prep: FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES FDO_DISTRIBUTION_TAG: $DEBIAN_TAG -ubuntu:21.10@container-prep: - extends: - - .fdo.container-build@ubuntu - - .policy - stage: prep - variables: - GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: '21.10' - FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES - FDO_DISTRIBUTION_TAG: $UBUNTU_TAG - ubuntu:22.04@container-prep: extends: - .fdo.container-build@ubuntu @@ -375,16 +364,6 @@ debian:stable@container-clean: FDO_DISTRIBUTION_VERSION: 'stable' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG -ubuntu:21.10@container-clean: - extends: - - .policy - - .container-clean - variables: - GIT_STRATEGY: none - CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG - FDO_DISTRIBUTION_VERSION: '21.10' - FDO_DISTRIBUTION_TAG: $UBUNTU_TAG - ubuntu:22.04@container-clean: extends: - .policy @@ -951,18 +930,6 @@ debian:stable@default-build: - "debian:stable@container-prep" -ubuntu:21.10@default-build: - stage: distro - extends: - - .build@template - - .fdo.distribution-image@ubuntu - variables: - FDO_DISTRIBUTION_VERSION: '21.10' - FDO_DISTRIBUTION_TAG: $UBUNTU_TAG - needs: - - "ubuntu:21.10@container-prep" - - ubuntu:22.04@default-build: stage: distro extends: diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index f5ddf8e..17446b8 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -65,7 +65,6 @@ distributions: - name: ubuntu tag: *default_tag versions: - - '21.10' - '22.04' packages: - git