diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-10-07 20:46:25 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-10-11 09:47:39 +0200 |
| commit | dc2cbe1858b104dbf00130c410c97414fbac6d49 (patch) | |
| tree | e77a65483dacca155c0c666d79b2e1a8c89a8648 | |
| parent | d5d68235581fbf3553ffa86fc635555cbc0a6451 (diff) | |
gitlab-ci: enable F38 container and regenerate containers
| -rw-r--r-- | .gitlab-ci.yml | 41 | ||||
| -rw-r--r-- | .gitlab-ci/config.yml | 3 |
2 files changed, 38 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2417f79903..e3ab8d404c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,11 +48,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bumping # ".default_tag". - FEDORA_TAG: '2022-07-06.0-fa9b72c30822' - UBUNTU_TAG: '2022-07-06.0-4b75c457c847' - DEBIAN_TAG: '2022-07-06.0-4b75c457c847' - CENTOS_TAG: '2022-07-06.0-fa9b72c30822' - ALPINE_TAG: '2022-07-06.0-a2327031454c' + FEDORA_TAG: '2022-10-07.0-2f8d7f7c18cb' + UBUNTU_TAG: '2022-10-07.0-25f2a8708cc8' + DEBIAN_TAG: '2022-10-07.0-25f2a8708cc8' + CENTOS_TAG: '2022-10-07.0-2f8d7f7c18cb' + ALPINE_TAG: '2022-10-07.0-3e4fecdd883f' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -168,6 +168,16 @@ fedora:37@container-prep: FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC +fedora:38@container-prep: + extends: + - .fdo.container-build@fedora + stage: prep + variables: + GIT_STRATEGY: none + FDO_DISTRIBUTION_VERSION: '38' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC + ubuntu:18.04@container-prep: extends: - .fdo.container-build@ubuntu @@ -464,6 +474,15 @@ fedora:37@container-clean: FDO_DISTRIBUTION_VERSION: '37' FDO_DISTRIBUTION_TAG: $FEDORA_TAG +fedora:38@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: '38' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + ubuntu:18.04@container-clean: extends: - .container-clean @@ -755,6 +774,18 @@ t_fedora:37: - "fedora:37@container-prep" when: manual +t_fedora:38: + extends: + - .build@template + - .fdo.distribution-image@fedora + - .nm_artifacts_debug + variables: + FDO_DISTRIBUTION_VERSION: '38' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + needs: + - "fedora:38@container-prep" + when: manual + t_ubuntu:18.04: extends: - .build@template diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 8c1010f7b7..b52c0e3e67 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -8,7 +8,7 @@ # # We're happy to rebuild all containers when one changes. -.default_tag: &default_tag '2022-07-06.0' +.default_tag: &default_tag '2022-10-07.0' # The list of all distributions we want to create job for. @@ -26,6 +26,7 @@ distributions: - '35' - '36' - '37' + - '38' - name: ubuntu tag: *default_tag base_type: debian |