<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/26597">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
osmith: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">debian-bullseye-obs-latest: new image<br><br>Add missing container for -latest tests. Currently this causes the<br>-latest tests to fail.<br><br>Related: OS#4969<br>Change-Id: I1230e87784bc21b5a6424db0bd8734181ead9bfd<br>---<br>A debian-bullseye-obs-latest/Dockerfile<br>A debian-bullseye-obs-latest/Makefile<br>M jenkins-common.sh<br>3 files changed, 30 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian-bullseye-obs-latest/Dockerfile b/debian-bullseye-obs-latest/Dockerfile</span><br><span>new file mode 100644</span><br><span>index 0000000..fb8cd93</span><br><span>--- /dev/null</span><br><span>+++ b/debian-bullseye-obs-latest/Dockerfile</span><br><span>@@ -0,0 +1,26 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ARG REGISTRY=docker.io</span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:bullseye</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_11/"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN apt-get update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get upgrade -y && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(120, 100%, 40%);">+ telnet \</span><br><span style="color: hsl(120, 100%, 40%);">+ gnupg \</span><br><span style="color: hsl(120, 100%, 40%);">+ && \</span><br><span style="color: hsl(120, 100%, 40%);">+ apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+COPY .common/Release.key /tmp/Release.key</span><br><span style="color: hsl(120, 100%, 40%);">+RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Make respawn.sh part of this image, so it can be used by other images based on it</span><br><span style="color: hsl(120, 100%, 40%);">+COPY .common/respawn.sh /usr/local/bin/respawn.sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Invalidate cache once the repository is updated</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span>diff --git a/debian-bullseye-obs-latest/Makefile b/debian-bullseye-obs-latest/Makefile</span><br><span>new file mode 100644</span><br><span>index 0000000..736769d</span><br><span>--- /dev/null</span><br><span>+++ b/debian-bullseye-obs-latest/Makefile</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+UPSTREAM_DISTRO=debian:bullseye</span><br><span style="color: hsl(120, 100%, 40%);">+DISTRO=debian-bullseye</span><br><span style="color: hsl(120, 100%, 40%);">+include ../make/Makefile</span><br><span>diff --git a/jenkins-common.sh b/jenkins-common.sh</span><br><span>index 5af91fb..b74b952 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -19,7 +19,7 @@</span><br><span> osmo-*-latest-centos8) echo "centos8-obs-latest" ;;</span><br><span> osmo-*-centos7) echo "centos7-build" ;;</span><br><span> osmo-*-centos8) echo "centos8-build" ;;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-*-latest) echo "debian-stretch-obs-latest" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-latest) echo "debian-bullseye-obs-latest" ;;</span><br><span> osmo-*) echo "debian-bullseye-build" ;;</span><br><span> ttcn3-*) echo "debian-bullseye-titan" ;;</span><br><span> esac</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/26597">change 26597</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/26597"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1230e87784bc21b5a6424db0bd8734181ead9bfd </div>
<div style="display:none"> Gerrit-Change-Number: 26597 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>