[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/7] tests/docker: Update the tricore container to debian 10
From: |
Thomas Huth |
Subject: |
[PATCH 3/7] tests/docker: Update the tricore container to debian 10 |
Date: |
Mon, 21 Sep 2020 19:43:16 +0200 |
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(-)
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>
--
2.18.2
[PATCH 5/7] tests/docker: Remove old Debian 9 containers, Thomas Huth, 2020/09/21
[PATCH 6/7] gitlab-ci: Increase the timeout for the cross-compiler builds, Thomas Huth, 2020/09/21