From 6668e0fe21f190ab510e30cccfc2f3f5ae9e5a1f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 6 Feb 2020 10:23:45 +1000 Subject: [PATCH] gitlab CI: some more centos deduplication Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef8a4c8..9f42cac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -182,7 +182,7 @@ debian:sid@container-prep: TAG: $DEBIAN_TAG <<: *pull_upstream_or_rebuild -centos:7@container-prep: +.centos@container-prep: extends: .centos@container-build stage: container_prep variables: @@ -193,16 +193,15 @@ centos:7@container-prep: TAG: $CENTOS_TAG <<: *pull_upstream_or_rebuild +centos:7@container-prep: + extends: .centos@container-prep + variables: + CENTOS_VERSION: 7 + centos:8@container-prep: - extends: .centos@container-build - stage: container_prep + extends: .centos@container-prep variables: - GIT_STRATEGY: none CENTOS_VERSION: 8 - DISTRIB_FLAVOR: centos - DISTRIB_VERSION: $CENTOS_VERSION - TAG: $CENTOS_TAG - <<: *pull_upstream_or_rebuild arch:rolling@container-prep: extends: .arch@container-build @@ -348,19 +347,21 @@ debian:sid@container-clean: DEBIAN_VERSION: sid CURRENT_CONTAINER_IMAGE: $DEBIAN_CONTAINER_IMAGE -centos:7@container-clean: +.centos@container-clean: extends: .container-clean variables: GIT_STRATEGY: none - CENTOS_VERSION: 7 CURRENT_CONTAINER_IMAGE: $CENTOS_CONTAINER_IMAGE +centos:7@container-clean: + extends: .centos@container-clean + variables: + CENTOS_VERSION: 7 + centos:8@container-clean: - extends: .container-clean + extends: .centos@container-clean variables: - GIT_STRATEGY: none CENTOS_VERSION: 8 - CURRENT_CONTAINER_IMAGE: $CENTOS_CONTAINER_IMAGE arch:rolling@container-clean: extends: .container-clean -- 2.7.4