diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-02-16 08:31:55 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-02-21 17:03:37 +0100 |
| commit | e4c66b5666cf6580252ceda89d5f59176228d48a (patch) | |
| tree | 677b7f982f9fc8ffab16ff2efbac7eefa8465e08 | |
| parent | e73b78637cae969871f56409214f5493936c340e (diff) | |
| download | NetworkManager-e4c66b5666cf6580252ceda89d5f59176228d48a.tar.gz | |
Revert "gitlab-ci: disable CentOS 8 Linux containers"
ci-templates now works around the earlier problem to install CentOS 8
Linux containers. Re-add the tests.
This reverts commit b2d2b8d6fa05e6911c3a7599b35e38e149ddf873.
| -rw-r--r-- | .gitlab-ci.yml | 100 | ||||
| -rw-r--r-- | .gitlab-ci/config.yml | 3 |
2 files changed, 98 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a27e962c0..cb03d400bc 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-21.0-b8ebc9faeed7' - UBUNTU_TAG: '2022-02-21.0-0b989b22505f' - DEBIAN_TAG: '2022-02-21.0-0b989b22505f' - CENTOS_TAG: '2022-02-21.0-b8ebc9faeed7' - ALPINE_TAG: '2022-02-21.0-f12999972d57' + FEDORA_TAG: '2022-02-21.0-f42312ef8cae' + UBUNTU_TAG: '2022-02-21.0-ab561a08b357' + DEBIAN_TAG: '2022-02-21.0-ab561a08b357' + CENTOS_TAG: '2022-02-21.0-f42312ef8cae' + ALPINE_TAG: '2022-02-21.0-bad60eeb6900' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -304,6 +304,36 @@ 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 @@ -546,6 +576,33 @@ 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 @@ -817,6 +874,39 @@ 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 39d0abbaf2..cbbc35c3ec 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -52,6 +52,9 @@ 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 |