diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-09-21 17:54:20 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-09-21 17:54:20 +0200 |
| commit | d89398bc5261474351cc705e5c0c8473ccf9be3a (patch) | |
| tree | 74aee033bf9754a522ddafd6a277c474b76c90f8 | |
| parent | 48691a2101dcf1ab0e71a6afc8cf30c5b0101dd3 (diff) | |
| download | NetworkManager-th/dnf-in-fedora-gitlabci-rh2006403.tar.gz | |
| -rw-r--r-- | .gitlab-ci.yml | 70 | ||||
| -rw-r--r-- | .gitlab-ci/config.yml | 4 |
2 files changed, 67 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22de239b18..8143ef4c34 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-08-30.0-cd3afeeac844' - UBUNTU_TAG: '2021-08-30.0-6414c66cfe63' - DEBIAN_TAG: '2021-08-30.0-6414c66cfe63' - CENTOS_TAG: '2021-08-30.0-cd3afeeac844' - ALPINE_TAG: '2021-08-30.0-098c1144d4d6' + FEDORA_TAG: '2021-08-30.0-c68b1ebe5e9c' + UBUNTU_TAG: '2021-08-30.0-c20b4631986a' + DEBIAN_TAG: '2021-08-30.0-c20b4631986a' + CENTOS_TAG: '2021-08-30.0-c68b1ebe5e9c' + ALPINE_TAG: '2021-08-30.0-73186cbe0fc2' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -154,6 +154,26 @@ fedora:34@container-prep: FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC +fedora:35@container-prep: + extends: + - .fdo.container-build@fedora + stage: prep + variables: + GIT_STRATEGY: none + FDO_DISTRIBUTION_VERSION: '35' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC + +fedora:36@container-prep: + extends: + - .fdo.container-build@fedora + stage: prep + variables: + GIT_STRATEGY: none + FDO_DISTRIBUTION_VERSION: '36' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC + ubuntu:16.04@container-prep: extends: - .fdo.container-build@ubuntu @@ -441,6 +461,24 @@ fedora:34@container-clean: FDO_DISTRIBUTION_VERSION: '34' FDO_DISTRIBUTION_TAG: $FEDORA_TAG +fedora:35@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: '35' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + +fedora:36@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: '36' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + ubuntu:16.04@container-clean: extends: - .container-clean @@ -709,6 +747,28 @@ t_fedora:34: needs: - "fedora:34@container-prep" +t_fedora:35: + extends: + - .build@template + - .fdo.distribution-image@fedora + variables: + FDO_DISTRIBUTION_VERSION: '35' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + needs: + - "fedora:35@container-prep" + when: manual + +t_fedora:36: + extends: + - .build@template + - .fdo.distribution-image@fedora + variables: + FDO_DISTRIBUTION_VERSION: '36' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + needs: + - "fedora:36@container-prep" + when: manual + t_ubuntu:16.04: extends: - .build@template diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index a036c5cd7f..d3a7df2b71 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -25,8 +25,8 @@ distributions: - '32' - '33' - '34' - #- '35' - #- '36' + - '35' + - '36' - name: ubuntu tag: *default_tag base_type: debian |