diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-06 10:23:45 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-06 10:25:05 +1000 |
| commit | 6668e0fe21f190ab510e30cccfc2f3f5ae9e5a1f (patch) | |
| tree | e84192be5ccd37dfbe9dc249c8b608e9d697b5f1 /.gitlab-ci.yml | |
| parent | 5b97b970c0d44da0e1b044cb9b13616cdfa98177 (diff) | |
| download | libevdev-6668e0fe21f190ab510e30cccfc2f3f5ae9e5a1f.tar.gz | |
gitlab CI: some more centos deduplication
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 27 |
1 files 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 |