From 2d4a64ce2308d3f020c6e65ce48db2ba2f6c1ee8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 30 Aug 2021 11:37:08 +0200 Subject: [PATCH 1/6] contrib: remove "vala-tools" from "contrib/fedora/REQUIRED_PACKAGES" Since Fedora 25, vala-tools was merged with "vala" package. And on rawhide (f36) it's gone completely and leads to a failure of the script. Drop it. (cherry picked from commit 53562b19150c411d882b8e33e870dff67c4307e0) --- .gitlab-ci.yml | 4 ++-- contrib/fedora/REQUIRED_PACKAGES | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65b4d1e909..e40d643dc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,10 +47,10 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2021-07-12.0-475202004c1a' + FEDORA_TAG: '2021-07-12.0-6e150e4c2732' UBUNTU_TAG: '2021-07-12.0-b77047ed62be' DEBIAN_TAG: '2021-07-12.0-b77047ed62be' - CENTOS_TAG: '2021-07-12.0-475202004c1a' + CENTOS_TAG: '2021-07-12.0-6e150e4c2732' ALPINE_TAG: '2021-07-12.0-d7a8aea74089' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index ee2622de8d..5305f43b15 100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -82,7 +82,6 @@ install \ teamd-devel \ util-linux \ vala-devel \ - vala-tools \ valgrind \ which \ "${EXTRA_PACKAGES[@]}" From 79ed81bb0a582abc1ae28566e07f60bc9b0a12aa Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 30 Aug 2021 16:44:56 +0200 Subject: [PATCH 2/6] contrib,gitlab-ci: fix "contrib/fedora/REQUIRED_PACKAGES" to install "vala" Fixes: 53562b19150c ('contrib: remove "vala-tools" from "contrib/fedora/REQUIRED_PACKAGES"') (cherry picked from commit 414d2c1d4b3e7cfb0afdf7812ac3a06f3e66bab6) --- .gitlab-ci.yml | 4 ++-- contrib/fedora/REQUIRED_PACKAGES | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e40d643dc8..c953166e9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,10 +47,10 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2021-07-12.0-6e150e4c2732' + FEDORA_TAG: '2021-07-12.0-b19516ac22b6' UBUNTU_TAG: '2021-07-12.0-b77047ed62be' DEBIAN_TAG: '2021-07-12.0-b77047ed62be' - CENTOS_TAG: '2021-07-12.0-6e150e4c2732' + CENTOS_TAG: '2021-07-12.0-b19516ac22b6' ALPINE_TAG: '2021-07-12.0-d7a8aea74089' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index 5305f43b15..112b01bd2a 100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -81,6 +81,7 @@ install \ systemd-devel \ teamd-devel \ util-linux \ + vala \ vala-devel \ valgrind \ which \ From 1da22aaefa4726f7d93c1c503fce5492d4613ad7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 22 Sep 2021 09:11:10 +0200 Subject: [PATCH 3/6] gitlab-ci: update used ci-templates version It seems there is a problem building f35/f36 containers. Update the ci-templates version. (cherry picked from commit dc8c9d4bd2750f532a3df35a306062584f7141c1) --- .gitlab-ci.yml | 12 ++++++------ .gitlab-ci/ci.template | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c953166e9b..8a8387d7e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ ######################################## -.templates_sha: &template_sha b18e53bf67b9ed493a006d83dbadd1ecc0daa61a # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 14731f78c23c7b523a85a26a068ade9ac1ecd2f3 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: # Alpine container builder template @@ -47,11 +47,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2021-07-12.0-b19516ac22b6' - UBUNTU_TAG: '2021-07-12.0-b77047ed62be' - DEBIAN_TAG: '2021-07-12.0-b77047ed62be' - CENTOS_TAG: '2021-07-12.0-b19516ac22b6' - ALPINE_TAG: '2021-07-12.0-d7a8aea74089' + FEDORA_TAG: '2021-07-12.0-f3bd83023528' + UBUNTU_TAG: '2021-07-12.0-ceca385e1904' + DEBIAN_TAG: '2021-07-12.0-ceca385e1904' + CENTOS_TAG: '2021-07-12.0-f3bd83023528' + ALPINE_TAG: '2021-07-12.0-a623f8d1b2f8' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index ee28a32b07..04428d0f32 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -9,7 +9,7 @@ ######################################## -.templates_sha: &template_sha b18e53bf67b9ed493a006d83dbadd1ecc0daa61a # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 14731f78c23c7b523a85a26a068ade9ac1ecd2f3 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: {% for distro in distributions|sort(attribute="name") %} From 85d1802809a53ead4532030ba6d1596e3681ad62 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 22 Sep 2021 10:05:56 +0200 Subject: [PATCH 4/6] gitlab-ci: drop fedora 28/29 from gitlab-ci These containers are ancient. Also, when we update ci-templates they will no longer build (because then a different container hub will be used, which doesn't contain those images). Drop them. (cherry picked from commit 82b72a7379d843dd3ab875af772675b0287a822c) --- .gitlab-ci.yml | 70 ++++--------------------------------------- .gitlab-ci/config.yml | 2 -- 2 files changed, 5 insertions(+), 67 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a8387d7e5..6b053de287 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-12.0-f3bd83023528' - UBUNTU_TAG: '2021-07-12.0-ceca385e1904' - DEBIAN_TAG: '2021-07-12.0-ceca385e1904' - CENTOS_TAG: '2021-07-12.0-f3bd83023528' - ALPINE_TAG: '2021-07-12.0-a623f8d1b2f8' + FEDORA_TAG: '2021-07-12.0-ce2fde13c082' + UBUNTU_TAG: '2021-07-12.0-03cf2b545306' + DEBIAN_TAG: '2021-07-12.0-03cf2b545306' + CENTOS_TAG: '2021-07-12.0-ce2fde13c082' + ALPINE_TAG: '2021-07-12.0-deabecd7cba6' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -84,26 +84,6 @@ variables: # Build a container for each distribution + version. The ci-templates # will re-use the containers if the tag doesn't change. -fedora:28@container-prep: - extends: - - .fdo.container-build@fedora - stage: prep - variables: - GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: '28' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC - -fedora:29@container-prep: - extends: - - .fdo.container-build@fedora - stage: prep - variables: - GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: '29' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC - fedora:30@container-prep: extends: - .fdo.container-build@fedora @@ -368,24 +348,6 @@ alpine:latest@container-prep: only: - schedules -fedora:28@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: '28' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - -fedora:29@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: '29' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - fedora:30@container-clean: extends: - .container-clean @@ -613,28 +575,6 @@ alpine:latest@container-clean: ################################################################# -t_fedora:28: - extends: - - .build@template - - .fdo.distribution-image@fedora - variables: - FDO_DISTRIBUTION_VERSION: '28' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - needs: - - "fedora:28@container-prep" - when: manual - -t_fedora:29: - extends: - - .build@template - - .fdo.distribution-image@fedora - variables: - FDO_DISTRIBUTION_VERSION: '29' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - needs: - - "fedora:29@container-prep" - when: manual - t_fedora:30: extends: - .build@template diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index dc7cdbcec6..f8bb9404d0 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -18,8 +18,6 @@ distributions: tag: *default_tag base_type: fedora versions: - - '28' - - '29' - '30' - '31' - '32' From 126beb8a588607c055d5cb517a31501ab7ea17bd Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 4 Jan 2022 21:51:32 +0100 Subject: [PATCH 5/6] gitlab-ci: replace rawhide with f35 for gitlab-ci This is a stale branch. We don't want to test it against rawhide, because that is a moving target and keeps changing. Instead use Fedora 35. --- .gitlab-ci.yml | 24 ++++++++++++------------ .gitlab-ci/config.yml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b053de287..10e20a3e81 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-12.0-ce2fde13c082' - UBUNTU_TAG: '2021-07-12.0-03cf2b545306' - DEBIAN_TAG: '2021-07-12.0-03cf2b545306' - CENTOS_TAG: '2021-07-12.0-ce2fde13c082' - ALPINE_TAG: '2021-07-12.0-deabecd7cba6' + FEDORA_TAG: '2021-07-12.0-d4c78c08d9d0' + UBUNTU_TAG: '2021-07-12.0-5cf970042e30' + DEBIAN_TAG: '2021-07-12.0-5cf970042e30' + CENTOS_TAG: '2021-07-12.0-d4c78c08d9d0' + ALPINE_TAG: '2021-07-12.0-60385e44c795' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -134,13 +134,13 @@ 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 @@ -393,13 +393,13 @@ 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 ubuntu:16.04@container-clean: @@ -630,15 +630,15 @@ 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_ubuntu:16.04: diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index f8bb9404d0..5ea0e02e42 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -23,7 +23,7 @@ distributions: - '32' - '33' - '34' - - 'rawhide' + - '35' # always: # - '33' - name: ubuntu From 49b779b9b75c0bac06a78a2cd9ebbf9895d953be Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 4 Jan 2022 21:52:00 +0100 Subject: [PATCH 6/6] gitlab-ci: regenerate ci-templates's containers --- .gitlab-ci.yml | 10 +++++----- .gitlab-ci/config.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10e20a3e81..85c8652e21 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-12.0-d4c78c08d9d0' - UBUNTU_TAG: '2021-07-12.0-5cf970042e30' - DEBIAN_TAG: '2021-07-12.0-5cf970042e30' - CENTOS_TAG: '2021-07-12.0-d4c78c08d9d0' - ALPINE_TAG: '2021-07-12.0-60385e44c795' + FEDORA_TAG: '2022-01-04.0-ed7a83d49619' + UBUNTU_TAG: '2022-01-04.0-bcc65b379852' + DEBIAN_TAG: '2022-01-04.0-bcc65b379852' + CENTOS_TAG: '2022-01-04.0-ed7a83d49619' + ALPINE_TAG: '2022-01-04.0-3caa10046464' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 5ea0e02e42..23a402da11 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-12.0' +.default_tag: &default_tag '2022-01-04.0' # The list of all distributions we want to create job for.