diff options
author | Thomas Haller <thaller@redhat.com> | 2022-02-14 17:13:21 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2022-02-14 17:15:20 +0100 |
commit | b2d2b8d6fa05e6911c3a7599b35e38e149ddf873 (patch) | |
tree | 3acf38e0ca2b7856030f2b97e607e108ffc46573 | |
parent | a4bc4f63db377c55218a8661b747b0d534c274f2 (diff) | |
download | NetworkManager-b2d2b8d6fa05e6911c3a7599b35e38e149ddf873.tar.gz |
gitlab-ci: disable CentOS 8 Linux containers
CentOS 8 Linux is end of life. That wouldn't bother us, but when
you start such a container
$ podman run -ti --privileged quay.io/centos/centos:8.3.2011
then `dnf upgrade` will fail, because the mirror list returns
nothing. To work around that, we need to adjust ci-templates ([1]).
The work around might be to patch /etc/yum.repos.d when creating
the container image ([2]).
For now (or maybe indefinitely) disable these build targets.
[1] https://gitlab.freedesktop.org/freedesktop/ci-templates/-/merge_requests/131
[2] https://stackoverflow.com/questions/70926799/centos-through-vm-no-urls-in-mirrorlist
-rw-r--r-- | .gitlab-ci.yml | 100 | ||||
-rw-r--r-- | .gitlab-ci/config.yml | 3 |
2 files changed, 5 insertions, 98 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index add0845015..51ce0dc604 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: '2022-02-14.0-3804e9403f0c' - UBUNTU_TAG: '2022-02-14.0-747f2537c589' - DEBIAN_TAG: '2022-02-14.0-747f2537c589' - CENTOS_TAG: '2022-02-14.0-3804e9403f0c' - ALPINE_TAG: '2022-02-14.0-8d613ac1d9fd' + FEDORA_TAG: '2022-02-14.0-8384452eb54e' + UBUNTU_TAG: '2022-02-14.0-bd3c060f94c2' + DEBIAN_TAG: '2022-02-14.0-bd3c060f94c2' + CENTOS_TAG: '2022-02-14.0-8384452eb54e' + ALPINE_TAG: '2022-02-14.0-0990abecb69f' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -304,36 +304,6 @@ centos:7.9.2009@container-prep: FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC -centos:8.1.1911@container-prep: - extends: - - .fdo.container-build@centos - stage: prep - variables: - GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: '8.1.1911' - FDO_DISTRIBUTION_TAG: $CENTOS_TAG - FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC - -centos:8.2.2004@container-prep: - extends: - - .fdo.container-build@centos - stage: prep - variables: - GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: '8.2.2004' - FDO_DISTRIBUTION_TAG: $CENTOS_TAG - FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC - -centos:8.3.2011@container-prep: - extends: - - .fdo.container-build@centos - stage: prep - variables: - GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: '8.3.2011' - FDO_DISTRIBUTION_TAG: $CENTOS_TAG - FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC - alpine:latest@container-prep: extends: - .fdo.container-build@alpine @@ -576,33 +546,6 @@ centos:7.9.2009@container-clean: FDO_DISTRIBUTION_VERSION: '7.9.2009' FDO_DISTRIBUTION_TAG: $CENTOS_TAG -centos:8.1.1911@container-clean: - extends: - - .container-clean - variables: - GIT_STRATEGY: none - CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/centos/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG - FDO_DISTRIBUTION_VERSION: '8.1.1911' - FDO_DISTRIBUTION_TAG: $CENTOS_TAG - -centos:8.2.2004@container-clean: - extends: - - .container-clean - variables: - GIT_STRATEGY: none - CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/centos/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG - FDO_DISTRIBUTION_VERSION: '8.2.2004' - FDO_DISTRIBUTION_TAG: $CENTOS_TAG - -centos:8.3.2011@container-clean: - extends: - - .container-clean - variables: - GIT_STRATEGY: none - CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/centos/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG - FDO_DISTRIBUTION_VERSION: '8.3.2011' - FDO_DISTRIBUTION_TAG: $CENTOS_TAG - alpine:latest@container-clean: extends: - .container-clean @@ -874,39 +817,6 @@ t_centos:7.9.2009: - "centos:7.9.2009@container-prep" when: manual -t_centos:8.1.1911: - extends: - - .build@template - - .fdo.distribution-image@centos - variables: - FDO_DISTRIBUTION_VERSION: '8.1.1911' - FDO_DISTRIBUTION_TAG: $CENTOS_TAG - needs: - - "centos:8.1.1911@container-prep" - when: manual - -t_centos:8.2.2004: - extends: - - .build@template - - .fdo.distribution-image@centos - variables: - FDO_DISTRIBUTION_VERSION: '8.2.2004' - FDO_DISTRIBUTION_TAG: $CENTOS_TAG - needs: - - "centos:8.2.2004@container-prep" - when: manual - -t_centos:8.3.2011: - extends: - - .build@template - - .fdo.distribution-image@centos - variables: - FDO_DISTRIBUTION_VERSION: '8.3.2011' - FDO_DISTRIBUTION_TAG: $CENTOS_TAG - needs: - - "centos:8.3.2011@container-prep" - when: manual - t_alpine:latest: extends: - .build@template diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 6acf09b855..c1a442ad6b 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -52,9 +52,6 @@ distributions: - '7.7.1908' - '7.8.2003' - '7.9.2009' - - '8.1.1911' - - '8.2.2004' - - '8.3.2011' - name: alpine tag: *default_tag base_type: alpine |