gitlab-ci: make tier tests automatic to simplify starting them manually

We want that the tier2+ tests are only run manually. As those tests
depend on the respective prep step, there are 3 possibilities:

1) make prep manual and the tier test automatic. That is what we would
   want, because then we can just manually trigger the prep step (one
   click). However, in the past this didn't work.

2) make the prep automatic and the test manual. That works, the downside
   is that we often run the prep step when its not needed. This is what
   we used to do to workaround 1).

3) make prep and the test manual. Then there are no unnecessary tests
   run, but triggering a manual test is cumbersome. First click to start
   the prep step, then wait, then click again.

Revisit this. It seems 1) is working now. Yeay.

Also rename the prep stages, so that it's clear to which tier they
belong. I guess, I could move them instead to prep1, prep2, prep3
stages, but then there are a lot of columns on the web site.
This commit is contained in:
Thomas Haller
2023-04-13 08:43:25 +02:00
parent afe098a928
commit 5475f57d39
2 changed files with 97 additions and 97 deletions

View File

@@ -57,11 +57,11 @@ variables:
# #
# This is done by running `ci-fairy generate-template` and possibly bumping # This is done by running `ci-fairy generate-template` and possibly bumping
# ".default_tag". # ".default_tag".
ALPINE_TAG: 'tag-93cf50e3b143' ALPINE_TAG: 'tag-c6ac275362b2'
CENTOS_TAG: 'tag-43e358544423' CENTOS_TAG: 'tag-80e000f258af'
DEBIAN_TAG: 'tag-08e17e4980fb' DEBIAN_TAG: 'tag-f961edd7a574'
FEDORA_TAG: 'tag-43e358544423' FEDORA_TAG: 'tag-80e000f258af'
UBUNTU_TAG: 'tag-08e17e4980fb' UBUNTU_TAG: 'tag-f961edd7a574'
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh' ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh' CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -97,7 +97,7 @@ variables:
# Build a container for each distribution + version. The ci-templates # Build a container for each distribution + version. The ci-templates
# will re-use the containers if the tag doesn't change. # will re-use the containers if the tag doesn't change.
fedora:37@prep: tier1:fedora:37@prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@@ -107,7 +107,7 @@ fedora:37@prep:
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
fedora:36@prep: tier2:fedora:36@prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@@ -116,8 +116,9 @@ fedora:36@prep:
FDO_DISTRIBUTION_VERSION: '36' FDO_DISTRIBUTION_VERSION: '36'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
when: manual
fedora:38@prep: tier2:fedora:38@prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@@ -126,8 +127,9 @@ fedora:38@prep:
FDO_DISTRIBUTION_VERSION: '38' FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
when: manual
fedora:30@prep: tier3:fedora:30@prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@@ -136,8 +138,9 @@ fedora:30@prep:
FDO_DISTRIBUTION_VERSION: '30' FDO_DISTRIBUTION_VERSION: '30'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
when: manual
fedora:31@prep: tier3:fedora:31@prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@@ -146,8 +149,9 @@ fedora:31@prep:
FDO_DISTRIBUTION_VERSION: '31' FDO_DISTRIBUTION_VERSION: '31'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
when: manual
fedora:32@prep: tier3:fedora:32@prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@@ -156,8 +160,9 @@ fedora:32@prep:
FDO_DISTRIBUTION_VERSION: '32' FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
when: manual
fedora:33@prep: tier3:fedora:33@prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@@ -166,8 +171,9 @@ fedora:33@prep:
FDO_DISTRIBUTION_VERSION: '33' FDO_DISTRIBUTION_VERSION: '33'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
when: manual
fedora:34@prep: tier3:fedora:34@prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@@ -176,8 +182,9 @@ fedora:34@prep:
FDO_DISTRIBUTION_VERSION: '34' FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
when: manual
fedora:35@prep: tier3:fedora:35@prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
@@ -186,8 +193,9 @@ fedora:35@prep:
FDO_DISTRIBUTION_VERSION: '35' FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
when: manual
ubuntu:18.04@prep: tier2:ubuntu:18.04@prep:
extends: extends:
- .fdo.container-build@ubuntu - .fdo.container-build@ubuntu
stage: prep stage: prep
@@ -196,8 +204,9 @@ ubuntu:18.04@prep:
FDO_DISTRIBUTION_VERSION: '18.04' FDO_DISTRIBUTION_VERSION: '18.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC
when: manual
ubuntu:20.04@prep: tier2:ubuntu:20.04@prep:
extends: extends:
- .fdo.container-build@ubuntu - .fdo.container-build@ubuntu
stage: prep stage: prep
@@ -206,8 +215,9 @@ ubuntu:20.04@prep:
FDO_DISTRIBUTION_VERSION: '20.04' FDO_DISTRIBUTION_VERSION: '20.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC
when: manual
ubuntu:22.04@prep: tier2:ubuntu:22.04@prep:
extends: extends:
- .fdo.container-build@ubuntu - .fdo.container-build@ubuntu
stage: prep stage: prep
@@ -216,8 +226,9 @@ ubuntu:22.04@prep:
FDO_DISTRIBUTION_VERSION: '22.04' FDO_DISTRIBUTION_VERSION: '22.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC
when: manual
ubuntu:devel@prep: tier2:ubuntu:devel@prep:
extends: extends:
- .fdo.container-build@ubuntu - .fdo.container-build@ubuntu
stage: prep stage: prep
@@ -226,8 +237,9 @@ ubuntu:devel@prep:
FDO_DISTRIBUTION_VERSION: 'devel' FDO_DISTRIBUTION_VERSION: 'devel'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC
when: manual
ubuntu:rolling@prep: tier2:ubuntu:rolling@prep:
extends: extends:
- .fdo.container-build@ubuntu - .fdo.container-build@ubuntu
stage: prep stage: prep
@@ -236,8 +248,9 @@ ubuntu:rolling@prep:
FDO_DISTRIBUTION_VERSION: 'rolling' FDO_DISTRIBUTION_VERSION: 'rolling'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC
when: manual
debian:10@prep: tier2:debian:10@prep:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
stage: prep stage: prep
@@ -246,8 +259,9 @@ debian:10@prep:
FDO_DISTRIBUTION_VERSION: '10' FDO_DISTRIBUTION_VERSION: '10'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC
when: manual
debian:11@prep: tier2:debian:11@prep:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
stage: prep stage: prep
@@ -256,8 +270,9 @@ debian:11@prep:
FDO_DISTRIBUTION_VERSION: '11' FDO_DISTRIBUTION_VERSION: '11'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC
when: manual
debian:sid@prep: tier2:debian:sid@prep:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
stage: prep stage: prep
@@ -266,8 +281,9 @@ debian:sid@prep:
FDO_DISTRIBUTION_VERSION: 'sid' FDO_DISTRIBUTION_VERSION: 'sid'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC
when: manual
debian:9@prep: tier3:debian:9@prep:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
stage: prep stage: prep
@@ -276,8 +292,9 @@ debian:9@prep:
FDO_DISTRIBUTION_VERSION: '9' FDO_DISTRIBUTION_VERSION: '9'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC
when: manual
debian:testing@prep: tier3:debian:testing@prep:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
stage: prep stage: prep
@@ -286,8 +303,9 @@ debian:testing@prep:
FDO_DISTRIBUTION_VERSION: 'testing' FDO_DISTRIBUTION_VERSION: 'testing'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC
when: manual
centos:7.5.1804@prep: tier2:centos:7.5.1804@prep:
extends: extends:
- .fdo.container-build@centos - .fdo.container-build@centos
stage: prep stage: prep
@@ -296,8 +314,9 @@ centos:7.5.1804@prep:
FDO_DISTRIBUTION_VERSION: '7.5.1804' FDO_DISTRIBUTION_VERSION: '7.5.1804'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
when: manual
centos:7.9.2009@prep: tier2:centos:7.9.2009@prep:
extends: extends:
- .fdo.container-build@centos - .fdo.container-build@centos
stage: prep stage: prep
@@ -306,8 +325,9 @@ centos:7.9.2009@prep:
FDO_DISTRIBUTION_VERSION: '7.9.2009' FDO_DISTRIBUTION_VERSION: '7.9.2009'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
when: manual
centos:8.1.1911@prep: tier2:centos:8.1.1911@prep:
extends: extends:
- .fdo.container-build@centos - .fdo.container-build@centos
stage: prep stage: prep
@@ -316,8 +336,9 @@ centos:8.1.1911@prep:
FDO_DISTRIBUTION_VERSION: '8.1.1911' FDO_DISTRIBUTION_VERSION: '8.1.1911'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
when: manual
centos:8.3.2011@prep: tier2:centos:8.3.2011@prep:
extends: extends:
- .fdo.container-build@centos - .fdo.container-build@centos
stage: prep stage: prep
@@ -326,8 +347,9 @@ centos:8.3.2011@prep:
FDO_DISTRIBUTION_VERSION: '8.3.2011' FDO_DISTRIBUTION_VERSION: '8.3.2011'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
when: manual
centos:7.6.1810@prep: tier3:centos:7.6.1810@prep:
extends: extends:
- .fdo.container-build@centos - .fdo.container-build@centos
stage: prep stage: prep
@@ -336,8 +358,9 @@ centos:7.6.1810@prep:
FDO_DISTRIBUTION_VERSION: '7.6.1810' FDO_DISTRIBUTION_VERSION: '7.6.1810'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
when: manual
centos:7.7.1908@prep: tier3:centos:7.7.1908@prep:
extends: extends:
- .fdo.container-build@centos - .fdo.container-build@centos
stage: prep stage: prep
@@ -346,8 +369,9 @@ centos:7.7.1908@prep:
FDO_DISTRIBUTION_VERSION: '7.7.1908' FDO_DISTRIBUTION_VERSION: '7.7.1908'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
when: manual
centos:7.8.2003@prep: tier3:centos:7.8.2003@prep:
extends: extends:
- .fdo.container-build@centos - .fdo.container-build@centos
stage: prep stage: prep
@@ -356,8 +380,9 @@ centos:7.8.2003@prep:
FDO_DISTRIBUTION_VERSION: '7.8.2003' FDO_DISTRIBUTION_VERSION: '7.8.2003'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
when: manual
centos:8.2.2004@prep: tier3:centos:8.2.2004@prep:
extends: extends:
- .fdo.container-build@centos - .fdo.container-build@centos
stage: prep stage: prep
@@ -366,8 +391,9 @@ centos:8.2.2004@prep:
FDO_DISTRIBUTION_VERSION: '8.2.2004' FDO_DISTRIBUTION_VERSION: '8.2.2004'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
when: manual
alpine:latest@prep: tier2:alpine:latest@prep:
extends: extends:
- .fdo.container-build@alpine - .fdo.container-build@alpine
stage: prep stage: prep
@@ -376,6 +402,7 @@ alpine:latest@prep:
FDO_DISTRIBUTION_VERSION: 'latest' FDO_DISTRIBUTION_VERSION: 'latest'
FDO_DISTRIBUTION_TAG: $ALPINE_TAG FDO_DISTRIBUTION_TAG: $ALPINE_TAG
FDO_DISTRIBUTION_EXEC: $ALPINE_EXEC FDO_DISTRIBUTION_EXEC: $ALPINE_EXEC
when: manual
################################################################# #################################################################
# # # #
@@ -708,7 +735,7 @@ t_fedora:37:
FDO_DISTRIBUTION_VERSION: '37' FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:37@prep" - "tier1:fedora:37@prep"
t_fedora:36: t_fedora:36:
extends: extends:
@@ -720,8 +747,7 @@ t_fedora:36:
FDO_DISTRIBUTION_VERSION: '36' FDO_DISTRIBUTION_VERSION: '36'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:36@prep" - "tier2:fedora:36@prep"
when: manual
t_fedora:38: t_fedora:38:
extends: extends:
@@ -733,8 +759,7 @@ t_fedora:38:
FDO_DISTRIBUTION_VERSION: '38' FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:38@prep" - "tier2:fedora:38@prep"
when: manual
t_fedora:30: t_fedora:30:
extends: extends:
@@ -746,8 +771,7 @@ t_fedora:30:
FDO_DISTRIBUTION_VERSION: '30' FDO_DISTRIBUTION_VERSION: '30'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:30@prep" - "tier3:fedora:30@prep"
when: manual
t_fedora:31: t_fedora:31:
extends: extends:
@@ -759,8 +783,7 @@ t_fedora:31:
FDO_DISTRIBUTION_VERSION: '31' FDO_DISTRIBUTION_VERSION: '31'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:31@prep" - "tier3:fedora:31@prep"
when: manual
t_fedora:32: t_fedora:32:
extends: extends:
@@ -772,8 +795,7 @@ t_fedora:32:
FDO_DISTRIBUTION_VERSION: '32' FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:32@prep" - "tier3:fedora:32@prep"
when: manual
t_fedora:33: t_fedora:33:
extends: extends:
@@ -785,8 +807,7 @@ t_fedora:33:
FDO_DISTRIBUTION_VERSION: '33' FDO_DISTRIBUTION_VERSION: '33'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:33@prep" - "tier3:fedora:33@prep"
when: manual
t_fedora:34: t_fedora:34:
extends: extends:
@@ -798,8 +819,7 @@ t_fedora:34:
FDO_DISTRIBUTION_VERSION: '34' FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:34@prep" - "tier3:fedora:34@prep"
when: manual
t_fedora:35: t_fedora:35:
extends: extends:
@@ -811,8 +831,7 @@ t_fedora:35:
FDO_DISTRIBUTION_VERSION: '35' FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:35@prep" - "tier3:fedora:35@prep"
when: manual
t_ubuntu:18.04: t_ubuntu:18.04:
extends: extends:
@@ -824,8 +843,7 @@ t_ubuntu:18.04:
FDO_DISTRIBUTION_VERSION: '18.04' FDO_DISTRIBUTION_VERSION: '18.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs: needs:
- "ubuntu:18.04@prep" - "tier2:ubuntu:18.04@prep"
when: manual
t_ubuntu:20.04: t_ubuntu:20.04:
extends: extends:
@@ -837,8 +855,7 @@ t_ubuntu:20.04:
FDO_DISTRIBUTION_VERSION: '20.04' FDO_DISTRIBUTION_VERSION: '20.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs: needs:
- "ubuntu:20.04@prep" - "tier2:ubuntu:20.04@prep"
when: manual
t_ubuntu:22.04: t_ubuntu:22.04:
extends: extends:
@@ -850,8 +867,7 @@ t_ubuntu:22.04:
FDO_DISTRIBUTION_VERSION: '22.04' FDO_DISTRIBUTION_VERSION: '22.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs: needs:
- "ubuntu:22.04@prep" - "tier2:ubuntu:22.04@prep"
when: manual
t_ubuntu:devel: t_ubuntu:devel:
extends: extends:
@@ -863,8 +879,7 @@ t_ubuntu:devel:
FDO_DISTRIBUTION_VERSION: 'devel' FDO_DISTRIBUTION_VERSION: 'devel'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs: needs:
- "ubuntu:devel@prep" - "tier2:ubuntu:devel@prep"
when: manual
t_ubuntu:rolling: t_ubuntu:rolling:
extends: extends:
@@ -876,8 +891,7 @@ t_ubuntu:rolling:
FDO_DISTRIBUTION_VERSION: 'rolling' FDO_DISTRIBUTION_VERSION: 'rolling'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs: needs:
- "ubuntu:rolling@prep" - "tier2:ubuntu:rolling@prep"
when: manual
t_debian:10: t_debian:10:
extends: extends:
@@ -889,8 +903,7 @@ t_debian:10:
FDO_DISTRIBUTION_VERSION: '10' FDO_DISTRIBUTION_VERSION: '10'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
needs: needs:
- "debian:10@prep" - "tier2:debian:10@prep"
when: manual
t_debian:11: t_debian:11:
extends: extends:
@@ -902,8 +915,7 @@ t_debian:11:
FDO_DISTRIBUTION_VERSION: '11' FDO_DISTRIBUTION_VERSION: '11'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
needs: needs:
- "debian:11@prep" - "tier2:debian:11@prep"
when: manual
t_debian:sid: t_debian:sid:
extends: extends:
@@ -915,8 +927,7 @@ t_debian:sid:
FDO_DISTRIBUTION_VERSION: 'sid' FDO_DISTRIBUTION_VERSION: 'sid'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
needs: needs:
- "debian:sid@prep" - "tier2:debian:sid@prep"
when: manual
t_debian:9: t_debian:9:
extends: extends:
@@ -928,8 +939,7 @@ t_debian:9:
FDO_DISTRIBUTION_VERSION: '9' FDO_DISTRIBUTION_VERSION: '9'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
needs: needs:
- "debian:9@prep" - "tier3:debian:9@prep"
when: manual
t_debian:testing: t_debian:testing:
extends: extends:
@@ -941,8 +951,7 @@ t_debian:testing:
FDO_DISTRIBUTION_VERSION: 'testing' FDO_DISTRIBUTION_VERSION: 'testing'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
needs: needs:
- "debian:testing@prep" - "tier3:debian:testing@prep"
when: manual
t_centos:7.5.1804: t_centos:7.5.1804:
extends: extends:
@@ -954,8 +963,7 @@ t_centos:7.5.1804:
FDO_DISTRIBUTION_VERSION: '7.5.1804' FDO_DISTRIBUTION_VERSION: '7.5.1804'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
needs: needs:
- "centos:7.5.1804@prep" - "tier2:centos:7.5.1804@prep"
when: manual
t_centos:7.9.2009: t_centos:7.9.2009:
extends: extends:
@@ -967,8 +975,7 @@ t_centos:7.9.2009:
FDO_DISTRIBUTION_VERSION: '7.9.2009' FDO_DISTRIBUTION_VERSION: '7.9.2009'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
needs: needs:
- "centos:7.9.2009@prep" - "tier2:centos:7.9.2009@prep"
when: manual
t_centos:8.1.1911: t_centos:8.1.1911:
extends: extends:
@@ -980,8 +987,7 @@ t_centos:8.1.1911:
FDO_DISTRIBUTION_VERSION: '8.1.1911' FDO_DISTRIBUTION_VERSION: '8.1.1911'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
needs: needs:
- "centos:8.1.1911@prep" - "tier2:centos:8.1.1911@prep"
when: manual
t_centos:8.3.2011: t_centos:8.3.2011:
extends: extends:
@@ -993,8 +999,7 @@ t_centos:8.3.2011:
FDO_DISTRIBUTION_VERSION: '8.3.2011' FDO_DISTRIBUTION_VERSION: '8.3.2011'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
needs: needs:
- "centos:8.3.2011@prep" - "tier2:centos:8.3.2011@prep"
when: manual
t_centos:7.6.1810: t_centos:7.6.1810:
extends: extends:
@@ -1006,8 +1011,7 @@ t_centos:7.6.1810:
FDO_DISTRIBUTION_VERSION: '7.6.1810' FDO_DISTRIBUTION_VERSION: '7.6.1810'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
needs: needs:
- "centos:7.6.1810@prep" - "tier3:centos:7.6.1810@prep"
when: manual
t_centos:7.7.1908: t_centos:7.7.1908:
extends: extends:
@@ -1019,8 +1023,7 @@ t_centos:7.7.1908:
FDO_DISTRIBUTION_VERSION: '7.7.1908' FDO_DISTRIBUTION_VERSION: '7.7.1908'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
needs: needs:
- "centos:7.7.1908@prep" - "tier3:centos:7.7.1908@prep"
when: manual
t_centos:7.8.2003: t_centos:7.8.2003:
extends: extends:
@@ -1032,8 +1035,7 @@ t_centos:7.8.2003:
FDO_DISTRIBUTION_VERSION: '7.8.2003' FDO_DISTRIBUTION_VERSION: '7.8.2003'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
needs: needs:
- "centos:7.8.2003@prep" - "tier3:centos:7.8.2003@prep"
when: manual
t_centos:8.2.2004: t_centos:8.2.2004:
extends: extends:
@@ -1045,8 +1047,7 @@ t_centos:8.2.2004:
FDO_DISTRIBUTION_VERSION: '8.2.2004' FDO_DISTRIBUTION_VERSION: '8.2.2004'
FDO_DISTRIBUTION_TAG: $CENTOS_TAG FDO_DISTRIBUTION_TAG: $CENTOS_TAG
needs: needs:
- "centos:8.2.2004@prep" - "tier3:centos:8.2.2004@prep"
when: manual
t_alpine:latest: t_alpine:latest:
extends: extends:
@@ -1058,8 +1059,7 @@ t_alpine:latest:
FDO_DISTRIBUTION_VERSION: 'latest' FDO_DISTRIBUTION_VERSION: 'latest'
FDO_DISTRIBUTION_TAG: $ALPINE_TAG FDO_DISTRIBUTION_TAG: $ALPINE_TAG
needs: needs:
- "alpine:latest@prep" - "tier2:alpine:latest@prep"
when: manual
################################################################# #################################################################
# # # #
@@ -1074,7 +1074,7 @@ check-patch:
FDO_DISTRIBUTION_VERSION: '37' FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:37@prep" - "tier1:fedora:37@prep"
stage: tier1 stage: tier1
script: script:
- date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh
@@ -1087,7 +1087,7 @@ check-tree:
FDO_DISTRIBUTION_VERSION: '37' FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:37@prep" - "tier1:fedora:37@prep"
stage: tier1 stage: tier1
script: script:
- date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-python-black-format.sh --check - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-python-black-format.sh --check

View File

@@ -104,7 +104,7 @@ variables:
{% for distro in distributions %} {% for distro in distributions %}
{% for version in distro.versions %} {% for version in distro.versions %}
{{distro.name}}:{{version}}@prep: tier{{distro.tier}}:{{distro.name}}:{{version}}@prep:
extends: extends:
- .fdo.container-build@{{distro.name}} - .fdo.container-build@{{distro.name}}
stage: prep stage: prep
@@ -113,6 +113,9 @@ variables:
FDO_DISTRIBUTION_VERSION: '{{version}}' FDO_DISTRIBUTION_VERSION: '{{version}}'
FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG
FDO_DISTRIBUTION_EXEC: ${{distro.name.upper()}}_EXEC FDO_DISTRIBUTION_EXEC: ${{distro.name.upper()}}_EXEC
{% if distro.tier > 1 %}
when: manual
{% endif %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
@@ -222,10 +225,7 @@ t_{{distro.name}}:{{version}}:
{% endfor %} {% endfor %}
{% endif %} {% endif %}
needs: needs:
- "{{distro.name}}:{{version}}@prep" - "tier{{distro.tier}}:{{distro.name}}:{{version}}@prep"
{% if distro.tier > 1 %}
when: manual
{% endif %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
@@ -242,7 +242,7 @@ check-patch:
FDO_DISTRIBUTION_VERSION: '{{default_distro.versions[0]}}' FDO_DISTRIBUTION_VERSION: '{{default_distro.versions[0]}}'
FDO_DISTRIBUTION_TAG: ${{default_distro.name.upper()}}_TAG FDO_DISTRIBUTION_TAG: ${{default_distro.name.upper()}}_TAG
needs: needs:
- "{{default_distro.name}}:{{default_distro.versions[0]}}@prep" - "tier{{default_distro.tier}}:{{default_distro.name}}:{{default_distro.versions[0]}}@prep"
stage: tier1 stage: tier1
script: script:
- date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh
@@ -255,7 +255,7 @@ check-tree:
FDO_DISTRIBUTION_VERSION: '{{default_distro.versions[0]}}' FDO_DISTRIBUTION_VERSION: '{{default_distro.versions[0]}}'
FDO_DISTRIBUTION_TAG: ${{default_distro.name.upper()}}_TAG FDO_DISTRIBUTION_TAG: ${{default_distro.name.upper()}}_TAG
needs: needs:
- "{{default_distro.name}}:{{default_distro.versions[0]}}@prep" - "tier{{default_distro.tier}}:{{default_distro.name}}:{{default_distro.versions[0]}}@prep"
stage: tier1 stage: tier1
script: script:
- date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-python-black-format.sh --check - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-python-black-format.sh --check