From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Willian Rampazzo" <willianr@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: [PULL 14/19] gitlab: Extract cross-container jobs to container-cross.yml
Date: Wed, 26 May 2021 23:18:33 +0200 [thread overview]
Message-ID: <20210526211838.421716-15-f4bug@amsat.org> (raw)
In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org>
Extract the jobs preparing the cross containers into a new file
(container-cross.yml).
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210525082556.4011380-5-f4bug@amsat.org>
---
.gitlab-ci.d/container-cross.yml | 192 ++++++++++++++++++++++++++++++
.gitlab-ci.d/containers.yml | 194 +------------------------------
2 files changed, 193 insertions(+), 193 deletions(-)
create mode 100644 .gitlab-ci.d/container-cross.yml
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
new file mode 100644
index 00000000000..0fcebe363a4
--- /dev/null
+++ b/.gitlab-ci.d/container-cross.yml
@@ -0,0 +1,192 @@
+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
+
+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
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 0acc8381ac1..bd01ae8f802 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -1,5 +1,6 @@
include:
- local: '/.gitlab-ci.d/container-core.yml'
+ - local: '/.gitlab-ci.d/container-cross.yml'
amd64-alpine-container:
extends: .container_job_template
@@ -16,27 +17,6 @@ amd64-debian11-container:
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
@@ -44,178 +24,6 @@ amd64-debian-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:
--
2.26.3
next prev parent reply other threads:[~2021-05-26 21:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 21:18 [PULL 00/19] gitlab-ci patches for 2021-05-26 Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 01/19] gitlab: Replace YAML anchors by extends (acceptance_test_job) Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 02/19] gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 03/19] gitlab: Enable cross-i386 builds of TCI Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 04/19] gitlab: Extract container job template to container-template.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 05/19] gitlab: Extract crossbuild job templates to crossbuild-template.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 06/19] gitlab: Extract DCO/style check jobs to static_checks.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 07/19] gitlab: Extract build stages to stages.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 08/19] gitlab: Extract default build/test jobs templates Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 09/19] gitlab: Extract core container jobs to container-core.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 10/19] gitlab: Drop linux user build job for CentOS 7 Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 11/19] gitlab: Extract all default build/test jobs to buildtest.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 12/19] gitlab: Move current job set to qemu-project.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 13/19] gitlab: Document how forks can use different set of jobs Philippe Mathieu-Daudé
2021-05-26 21:18 ` Philippe Mathieu-Daudé [this message]
2021-05-26 21:18 ` [PULL 15/19] gitlab: Keep Avocado reports during 1 week Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 16/19] gitlab: Run Avocado tests manually (except mainstream CI) Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 17/19] gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master' Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 18/19] gitlab: Convert check-dco/check-patch jobs to the 'rules' syntax Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 19/19] gitlab: Split gprof-gcov job Philippe Mathieu-Daudé
2021-05-27 7:16 ` Philippe Mathieu-Daudé
2021-05-27 13:56 ` [PULL 00/19] gitlab-ci patches for 2021-05-26 Peter Maydell
2021-05-27 14:51 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210526211838.421716-15-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.