| Message ID | 20200921174320.46062-3-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Do not support Debian 9 and Python 3.5 anymore | expand |
On Mon, Sep 21, 2020 at 07:43:15PM +0200, Thomas Huth wrote: > 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> > --- > .gitlab-ci.d/containers.yml | 14 -------------- > .gitlab-ci.yml | 1 - > 2 files changed, 15 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > 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 Yay, I never liked having so many layers. Regards, Daniel
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
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> --- .gitlab-ci.d/containers.yml | 14 -------------- .gitlab-ci.yml | 1 - 2 files changed, 15 deletions(-)