diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-12-16 13:02:35 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-12-16 13:06:47 +0100 |
| commit | 5118a44ed8b5d87f5caf841606fd09be9ca13e19 (patch) | |
| tree | 08f8298b30ce0b8aeb927383ec92399ec0db4835 | |
| parent | 14221979b429ec4918a1c405effb226e17352cac (diff) | |
debian-bullseye-obs-latest: new image
Add missing container for -latest tests. Currently this causes the
-latest tests to fail.
Related: OS#4969
Change-Id: I1230e87784bc21b5a6424db0bd8734181ead9bfd
| -rw-r--r-- | debian-bullseye-obs-latest/Dockerfile | 26 | ||||
| -rw-r--r-- | debian-bullseye-obs-latest/Makefile | 3 | ||||
| -rw-r--r-- | jenkins-common.sh | 2 |
3 files changed, 30 insertions, 1 deletions
diff --git a/debian-bullseye-obs-latest/Dockerfile b/debian-bullseye-obs-latest/Dockerfile new file mode 100644 index 0000000..fb8cd93 --- /dev/null +++ b/debian-bullseye-obs-latest/Dockerfile @@ -0,0 +1,26 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bullseye +FROM ${REGISTRY}/${UPSTREAM_DISTRO} +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_11/" + +RUN apt-get update && \ + apt-get upgrade -y && \ + apt-get install -y --no-install-recommends \ + telnet \ + gnupg \ + && \ + apt-get clean + +COPY .common/Release.key /tmp/Release.key +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +# Make respawn.sh part of this image, so it can be used by other images based on it +COPY .common/respawn.sh /usr/local/bin/respawn.sh + +# Invalidate cache once the repository is updated +ADD $OSMOCOM_REPO/Release /tmp/Release diff --git a/debian-bullseye-obs-latest/Makefile b/debian-bullseye-obs-latest/Makefile new file mode 100644 index 0000000..736769d --- /dev/null +++ b/debian-bullseye-obs-latest/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:bullseye +DISTRO=debian-bullseye +include ../make/Makefile diff --git a/jenkins-common.sh b/jenkins-common.sh index 5af91fb..b74b952 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -19,7 +19,7 @@ docker_depends() { osmo-*-latest-centos8) echo "centos8-obs-latest" ;; osmo-*-centos7) echo "centos7-build" ;; osmo-*-centos8) echo "centos8-build" ;; - osmo-*-latest) echo "debian-stretch-obs-latest" ;; + osmo-*-latest) echo "debian-bullseye-obs-latest" ;; osmo-*) echo "debian-bullseye-build" ;; ttcn3-*) echo "debian-bullseye-titan" ;; esac |