diff mbox series

[3/7] tests/docker: Update the tricore container to debian 10

Message ID 20200921174320.46062-4-thuth@redhat.com
State New
Headers show
Series Do not support Debian 9 and Python 3.5 anymore | expand

Commit Message

Thomas Huth Sept. 21, 2020, 5:43 p.m. UTC
We do not support Debian 9 anymore, thus update the Tricore container
to Debian 10 now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .gitlab-ci.d/containers.yml                          | 2 +-
 tests/docker/Makefile.include                        | 2 +-
 tests/docker/dockerfiles/debian-tricore-cross.docker | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Daniel P. Berrangé Sept. 21, 2020, 6:05 p.m. UTC | #1
On Mon, Sep 21, 2020 at 07:43:16PM +0200, Thomas Huth wrote:
> We do not support Debian 9 anymore, thus update the Tricore container

> to Debian 10 now.

> 

> Signed-off-by: Thomas Huth <thuth@redhat.com>

> ---

>  .gitlab-ci.d/containers.yml                          | 2 +-

>  tests/docker/Makefile.include                        | 2 +-

>  tests/docker/dockerfiles/debian-tricore-cross.docker | 2 +-

>  3 files changed, 3 insertions(+), 3 deletions(-)


Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>



Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Philippe Mathieu-Daudé Sept. 22, 2020, 10:35 a.m. UTC | #2
On 9/21/20 7:43 PM, Thomas Huth wrote:
> We do not support Debian 9 anymore, thus update the Tricore container
> to Debian 10 now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  .gitlab-ci.d/containers.yml                          | 2 +-
>  tests/docker/Makefile.include                        | 2 +-
>  tests/docker/dockerfiles/debian-tricore-cross.docker | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
> index 6769eef0ff..089cea7c14 100644
> --- a/.gitlab-ci.d/containers.yml
> +++ b/.gitlab-ci.d/containers.yml
> @@ -210,7 +210,7 @@ sparc64-debian-cross-container:
>  tricore-debian-cross-container:
>    <<: *container_job_definition
>    stage: containers-layer2
> -  needs: ['amd64-debian9-container']
> +  needs: ['amd64-debian10-container']
>    variables:
>      NAME: debian-tricore-cross
>  
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 75704268ff..02ec92830b 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -137,7 +137,7 @@ docker-image-debian-sparc64-cross: docker-image-debian10
>  docker-image-travis: NOUSER=1
>  
>  # Specialist build images, sometimes very limited tools
> -docker-image-debian-tricore-cross: docker-image-debian9
> +docker-image-debian-tricore-cross: docker-image-debian10
>  docker-image-debian-all-test-cross: docker-image-debian10
>  docker-image-debian-arm64-test-cross: docker-image-debian11
>  
> diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
> index 769d95c77b..985925134c 100644
> --- a/tests/docker/dockerfiles/debian-tricore-cross.docker
> +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
> @@ -7,7 +7,7 @@
>  #
>  # SPDX-License-Identifier: GPL-2.0-or-later
>  #
> -FROM qemu/debian9
> +FROM qemu/debian10
>  
>  MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
>  
>
diff mbox series

Patch

diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 6769eef0ff..089cea7c14 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -210,7 +210,7 @@  sparc64-debian-cross-container:
 tricore-debian-cross-container:
   <<: *container_job_definition
   stage: containers-layer2
-  needs: ['amd64-debian9-container']
+  needs: ['amd64-debian10-container']
   variables:
     NAME: debian-tricore-cross
 
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 75704268ff..02ec92830b 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -137,7 +137,7 @@  docker-image-debian-sparc64-cross: docker-image-debian10
 docker-image-travis: NOUSER=1
 
 # Specialist build images, sometimes very limited tools
-docker-image-debian-tricore-cross: docker-image-debian9
+docker-image-debian-tricore-cross: docker-image-debian10
 docker-image-debian-all-test-cross: docker-image-debian10
 docker-image-debian-arm64-test-cross: docker-image-debian11
 
diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
index 769d95c77b..985925134c 100644
--- a/tests/docker/dockerfiles/debian-tricore-cross.docker
+++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
@@ -7,7 +7,7 @@ 
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
-FROM qemu/debian9
+FROM qemu/debian10
 
 MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>