From 203b6fb1944c6ea6509bd9c3209b33d2d42d4de1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 30 Aug 2021 10:22:52 +0200 Subject: [PATCH] gitlab-ci: update which distros to build --- .gitlab-ci.yml | 114 +++++++++++++++++++++++++++++++++++++----- .gitlab-ci/config.yml | 9 ++-- 2 files changed, 107 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0e668d042..5e269dc969 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-07-21.0-578e8c7b0882' - UBUNTU_TAG: '2021-07-21.0-526620c887a1' - DEBIAN_TAG: '2021-07-21.0-526620c887a1' - CENTOS_TAG: '2021-07-21.0-578e8c7b0882' - ALPINE_TAG: '2021-07-21.0-074589112c5f' + FEDORA_TAG: '2021-08-30.0-c7597bbb4bd8' + UBUNTU_TAG: '2021-08-30.0-c68021283139' + DEBIAN_TAG: '2021-08-30.0-c68021283139' + CENTOS_TAG: '2021-08-30.0-c7597bbb4bd8' + ALPINE_TAG: '2021-08-30.0-9a4bb795bc30' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -154,13 +154,23 @@ fedora:34@container-prep: FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC -fedora:rawhide@container-prep: +fedora:35@container-prep: extends: - .fdo.container-build@fedora stage: prep variables: GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: 'rawhide' + 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 @@ -234,6 +244,16 @@ debian:10@container-prep: FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC +debian:11@container-prep: + extends: + - .fdo.container-build@debian + stage: prep + variables: + GIT_STRATEGY: none + FDO_DISTRIBUTION_VERSION: '11' + FDO_DISTRIBUTION_TAG: $DEBIAN_TAG + FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC + debian:testing@container-prep: extends: - .fdo.container-build@debian @@ -324,6 +344,16 @@ centos:8.2.2004@container-prep: 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 @@ -431,13 +461,22 @@ fedora:34@container-clean: FDO_DISTRIBUTION_VERSION: '34' FDO_DISTRIBUTION_TAG: $FEDORA_TAG -fedora:rawhide@container-clean: +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: 'rawhide' + 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: @@ -503,6 +542,15 @@ debian:10@container-clean: FDO_DISTRIBUTION_VERSION: '10' FDO_DISTRIBUTION_TAG: $DEBIAN_TAG +debian:11@container-clean: + extends: + - .container-clean + variables: + GIT_STRATEGY: none + CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG + FDO_DISTRIBUTION_VERSION: '11' + FDO_DISTRIBUTION_TAG: $DEBIAN_TAG + debian:testing@container-clean: extends: - .container-clean @@ -584,6 +632,15 @@ centos:8.2.2004@container-clean: 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 @@ -690,15 +747,26 @@ t_fedora:34: needs: - "fedora:34@container-prep" -t_fedora:rawhide: +t_fedora:35: extends: - .build@template - .fdo.distribution-image@fedora variables: - FDO_DISTRIBUTION_VERSION: 'rawhide' + FDO_DISTRIBUTION_VERSION: '35' FDO_DISTRIBUTION_TAG: $FEDORA_TAG needs: - - "fedora:rawhide@container-prep" + - "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: @@ -778,6 +846,17 @@ t_debian:10: - "debian:10@container-prep" when: manual +t_debian:11: + extends: + - .build@template + - .fdo.distribution-image@debian + variables: + FDO_DISTRIBUTION_VERSION: '11' + FDO_DISTRIBUTION_TAG: $DEBIAN_TAG + needs: + - "debian:11@container-prep" + when: manual + t_debian:testing: extends: - .build@template @@ -877,6 +956,17 @@ t_centos:8.2.2004: - "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 7f265c9621..d3a7df2b71 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 '2021-07-21.0' +.default_tag: &default_tag '2021-08-30.0' # The list of all distributions we want to create job for. @@ -25,9 +25,8 @@ distributions: - '32' - '33' - '34' - - 'rawhide' - # always: - # - '33' + - '35' + - '36' - name: ubuntu tag: *default_tag base_type: debian @@ -43,6 +42,7 @@ distributions: versions: - '9' - '10' + - '11' - 'testing' - 'sid' - name: centos @@ -56,6 +56,7 @@ distributions: - '7.9.2009' - '8.1.1911' - '8.2.2004' + - '8.3.2011' - name: alpine tag: *default_tag base_type: alpine