summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huth2020-09-25 17:40:22 +0200
committerAlex Bennée2020-10-02 13:29:04 +0200
commit5fdf6e22d9521b2c3a5a84b3d17141bf93572c0f (patch)
treed752d8b8a84ec07639364e0fb1e6d5ec9335342a
parenttests/docker: Use Fedora containers for MinGW cross-builds in the gitlab-CI (diff)
downloadqemu-5fdf6e22d9521b2c3a5a84b3d17141bf93572c0f.tar.gz
qemu-5fdf6e22d9521b2c3a5a84b3d17141bf93572c0f.tar.xz
qemu-5fdf6e22d9521b2c3a5a84b3d17141bf93572c0f.zip
gitlab-ci: Remove the Debian9-based containers and containers-layer3
According to our support policy, Debian 9 is not supported by the QEMU project anymore. Since we now switched the MinGW cross-compiler builds to Fedora, we do not need these Debian9-based containers in the gitlab-CI anymore, and can now also get rid of the "layer3" container build stage this way. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20200921174320.46062-3-thuth@redhat.com> Message-Id: <20200925154027.12672-11-alex.bennee@linaro.org>
-rw-r--r--.gitlab-ci.d/containers.yml14
-rw-r--r--.gitlab-ci.yml1
2 files changed, 0 insertions, 15 deletions
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 15e7b564f9..6769eef0ff 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -214,20 +214,6 @@ tricore-debian-cross-container:
variables:
NAME: debian-tricore-cross
-win32-debian-cross-container:
- <<: *container_job_definition
- stage: containers-layer3
- needs: ['amd64-debian9-mxe-container']
- variables:
- NAME: debian-win32-cross
-
-win64-debian-cross-container:
- <<: *container_job_definition
- stage: containers-layer3
- needs: ['amd64-debian9-mxe-container']
- variables:
- NAME: debian-win64-cross
-
xtensa-debian-cross-container:
<<: *container_job_definition
variables:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a18e18b57e..c265e7f8ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,6 @@
stages:
- containers
- containers-layer2
- - containers-layer3
- build
- test