<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/26583">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Switch ttcn3-* master tests from Debian stretch to bullseys<br><br>So far we were using ancient Debian 9 (stretch) for our IUT<br>containers. Let's upgrade that to Debian 11 (bullseye).<br><br>Related: OS#4969<br>Change-Id: Ic6bece9cb695e6eccfcb1e83fdbf1048724a3cf9<br>---<br>M jenkins-common.sh<br>M make/Makefile<br>2 files changed, 13 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/83/26583/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jenkins-common.sh b/jenkins-common.sh</span><br><span>index 9fcf02f..1fc9e20 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -20,7 +20,7 @@</span><br><span> osmo-*-centos7) echo "centos7-build" ;;</span><br><span> osmo-*-centos8) echo "centos8-build" ;;</span><br><span> osmo-*-latest) echo "debian-stretch-obs-latest" ;;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-*) echo "debian-stretch-build" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*) echo "debian-bullseye-build" ;;</span><br><span> ttcn3-*) echo "debian-bullseye-titan" ;;</span><br><span> esac</span><br><span> }</span><br><span>@@ -31,7 +31,8 @@</span><br><span> osmo-*-centos8) echo "centos8" ;;</span><br><span> centos7-*) echo "centos7" ;;</span><br><span> centos8-*) echo "centos8" ;;</span><br><span style="color: hsl(0, 100%, 40%);">- *) echo "debian-stretch" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ debian-buster-*) echo "debian-buster" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *) echo "debian-bullseye" ;;</span><br><span> esac</span><br><span> }</span><br><span> </span><br><span>@@ -42,7 +43,10 @@</span><br><span> centos7-*) echo "centos:centos7" ;;</span><br><span> centos8-*) echo "centos:centos8" ;;</span><br><span> debian10-*) echo "debian:buster" ;;</span><br><span style="color: hsl(0, 100%, 40%);">- *) echo "debian:stretch" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ debian11-*) echo "debian:bullseye" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ debian-stretch-*) echo "debian:stetch" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ debian-buster-*) echo "debian:buster" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *) echo "debian:bullseye" ;;</span><br><span> esac</span><br><span> }</span><br><span> </span><br><span>@@ -109,7 +113,7 @@</span><br><span> }</span><br><span> </span><br><span> # Make sure required images are available and build them if necessary.</span><br><span style="color: hsl(0, 100%, 40%);">-# $*: image names (e.g. "debian-stretch-build", "osmo-mgw-master", "osmo-mgw-master-centos8")</span><br><span style="color: hsl(120, 100%, 40%);">+# $*: image names (e.g. "debian-bullseye-build", "osmo-mgw-master", "osmo-mgw-master-centos8")</span><br><span> # The images are automatically built from the Dockerfile of the subdir of</span><br><span> # the same name. If there is a distribution name at the end of the image</span><br><span> # name (e.g. osmo-mgw-master-centos8), it gets removed from the subdir</span><br><span>@@ -232,8 +236,8 @@</span><br><span> }</span><br><span> </span><br><span> fix_perms() {</span><br><span style="color: hsl(0, 100%, 40%);">- if ! docker_image_exists "debian-stretch-build"; then</span><br><span style="color: hsl(0, 100%, 40%);">- docker_images_require "debian-stretch-build"</span><br><span style="color: hsl(120, 100%, 40%);">+ if ! docker_image_exists "debian-bullseye-build"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ docker_images_require "debian-bullseye-build"</span><br><span> fi</span><br><span> </span><br><span> echo Fixing permissions</span><br><span>@@ -241,7 +245,7 @@</span><br><span> -v $VOL_BASE_DIR:/data \</span><br><span> -v $CACHE_DIR:/cache \</span><br><span> --name ${BUILD_TAG}-cleaner \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/debian-stretch-build \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/debian-bullseye-build \</span><br><span> chmod -R a+rX /data/ /cache/</span><br><span> }</span><br><span> </span><br><span>diff --git a/make/Makefile b/make/Makefile</span><br><span>index 416fc18..8bd360d 100644</span><br><span>--- a/make/Makefile</span><br><span>+++ b/make/Makefile</span><br><span>@@ -36,8 +36,8 @@</span><br><span> OSMO_SIP_BRANCH?=master</span><br><span> OSMO_STP_BRANCH?=master</span><br><span> PULL?=</span><br><span style="color: hsl(0, 100%, 40%);">-UPSTREAM_DISTRO?=debian:stretch</span><br><span style="color: hsl(0, 100%, 40%);">-DISTRO?=debian-stretch</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> </span><br><span> # Full OBS repository mirror consists of:</span><br><span> # ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/26583">change 26583</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/+/26583"/><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: Ic6bece9cb695e6eccfcb1e83fdbf1048724a3cf9 </div>
<div style="display:none"> Gerrit-Change-Number: 26583 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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: newchange </div>