From 961889f00c958e5500ec13eba71fbc5ccd243fd0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 25 May 2021 09:03:17 +0200 Subject: [PATCH] gitlab: Extract cross-container jobs to container-cross.yml MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Extract the jobs preparing the cross containers into a new file (container-cross.yml). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Reviewed-by: Willian Rampazzo Message-Id: <20210525082556.4011380-5-f4bug@amsat.org> --- .../{containers.yml => container-cross.yml} | 45 ---- .gitlab-ci.d/containers.yml | 282 ++++----------------- 2 files changed, 45 insertions(+), 282 deletions(-) copy .gitlab-ci.d/{containers.yml => container-cross.yml} (84%) rewrite .gitlab-ci.d/containers.yml (84%) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/container-cross.yml similarity index 84% copy from .gitlab-ci.d/containers.yml copy to .gitlab-ci.d/container-cross.yml index 0acc8381ac..0fcebe363a 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -1,21 +1,3 @@ -include: - - local: '/.gitlab-ci.d/container-core.yml' - -amd64-alpine-container: - extends: .container_job_template - variables: - NAME: alpine - -amd64-centos7-container: - extends: .container_job_template - variables: - NAME: centos7 - -amd64-debian11-container: - extends: .container_job_template - variables: - NAME: debian11 - alpha-debian-cross-container: extends: .container_job_template stage: containers-layer2 @@ -37,13 +19,6 @@ amd64-debian-user-cross-container: variables: NAME: debian-all-test-cross -amd64-debian-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-amd64 - arm64-debian-cross-container: extends: .container_job_template stage: containers-layer2 @@ -215,23 +190,3 @@ win64-fedora-cross-container: extends: .container_job_template variables: NAME: fedora-win64-cross - -amd64-ubuntu1804-container: - extends: .container_job_template - variables: - NAME: ubuntu1804 - -amd64-ubuntu2004-container: - extends: .container_job_template - variables: - NAME: ubuntu2004 - -amd64-ubuntu-container: - extends: .container_job_template - variables: - NAME: ubuntu - -amd64-opensuse-leap-container: - extends: .container_job_template - variables: - NAME: opensuse-leap diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml dissimilarity index 84% index 0acc8381ac..bd01ae8f80 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,237 +1,45 @@ -include: - - local: '/.gitlab-ci.d/container-core.yml' - -amd64-alpine-container: - extends: .container_job_template - variables: - NAME: alpine - -amd64-centos7-container: - extends: .container_job_template - variables: - NAME: centos7 - -amd64-debian11-container: - extends: .container_job_template - variables: - NAME: debian11 - -alpha-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-alpha-cross - -amd64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-amd64-cross - -amd64-debian-user-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-all-test-cross - -amd64-debian-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-amd64 - -arm64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-arm64-cross - -arm64-test-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian11-container'] - variables: - NAME: debian-arm64-test-cross - -armel-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-armel-cross - -armhf-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-armhf-cross - -# We never want to build hexagon in the CI system and by default we -# always want to refer to the master registry where it lives. -hexagon-cross-container: - image: docker:stable - stage: containers - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' - when: never - - when: always - variables: - NAME: debian-hexagon-cross - GIT_DEPTH: 1 - services: - - docker:dind - before_script: - - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - - docker info - - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - script: - - echo "TAG:$TAG" - - echo "COMMON_TAG:$COMMON_TAG" - - docker pull $COMMON_TAG - - docker tag $COMMON_TAG $TAG - - docker push "$TAG" - after_script: - - docker logout - -hppa-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-hppa-cross - -m68k-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-m68k-cross - -mips64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mips64-cross - -mips64el-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mips64el-cross - -mips-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mips-cross - -mipsel-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mipsel-cross - -powerpc-test-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian11-container'] - variables: - NAME: debian-powerpc-test-cross - -ppc64el-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-ppc64el-cross - -riscv64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-riscv64-cross - -s390x-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-s390x-cross - -sh4-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-sh4-cross - -sparc64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-sparc64-cross - -tricore-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-tricore-cross - -xtensa-debian-cross-container: - extends: .container_job_template - variables: - NAME: debian-xtensa-cross - -cris-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-cris-cross - -i386-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-i386-cross - -win32-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-win32-cross - -win64-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-win64-cross - -amd64-ubuntu1804-container: - extends: .container_job_template - variables: - NAME: ubuntu1804 - -amd64-ubuntu2004-container: - extends: .container_job_template - variables: - NAME: ubuntu2004 - -amd64-ubuntu-container: - extends: .container_job_template - variables: - NAME: ubuntu - -amd64-opensuse-leap-container: - extends: .container_job_template - variables: - NAME: opensuse-leap +include: + - local: '/.gitlab-ci.d/container-core.yml' + - local: '/.gitlab-ci.d/container-cross.yml' + +amd64-alpine-container: + extends: .container_job_template + variables: + NAME: alpine + +amd64-centos7-container: + extends: .container_job_template + variables: + NAME: centos7 + +amd64-debian11-container: + extends: .container_job_template + variables: + NAME: debian11 + +amd64-debian-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-amd64 + +amd64-ubuntu1804-container: + extends: .container_job_template + variables: + NAME: ubuntu1804 + +amd64-ubuntu2004-container: + extends: .container_job_template + variables: + NAME: ubuntu2004 + +amd64-ubuntu-container: + extends: .container_job_template + variables: + NAME: ubuntu + +amd64-opensuse-leap-container: + extends: .container_job_template + variables: + NAME: opensuse-leap -- 2.11.4.GIT