<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/24118">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: Looks good to me, but someone else must approve
osmith: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jenkins-common.sh: support 2021q1 feed<br><br>Adjust docker_depends and docker_dir_from_image_name for 2021q1. Extend<br>README.md with examples.<br><br>Related: SYS#5370<br>Change-Id: Icf1e3f1928658ff3d82190c4176252cf3590a1f5<br>---<br>M README.md<br>M jenkins-common.sh<br>2 files changed, 52 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/README.md b/README.md</span><br><span>index 490e2a8..9a1889e 100644</span><br><span>--- a/README.md</span><br><span>+++ b/README.md</span><br><span>@@ -7,7 +7,8 @@</span><br><span> </span><br><span> ## Running a testsuite</span><br><span> All testsuite folders start with `ttcn3` or `nplab`. Run the following</span><br><span style="color: hsl(0, 100%, 40%);">-to build/update all required containers and start a specific testsuite:</span><br><span style="color: hsl(120, 100%, 40%);">+to build/update all required containers from the "master" branch and</span><br><span style="color: hsl(120, 100%, 40%);">+start a specific testsuite:</span><br><span> </span><br><span> ```</span><br><span> $ cd ttcn3-mgw-test</span><br><span>@@ -26,6 +27,33 @@</span><br><span> * `NO_DOCKER_IMAGE_BUILD`: when set to `1`, it won't try to update the</span><br><span> containers (see "caching" below)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+### More examples</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+latest (debian):</span><br><span style="color: hsl(120, 100%, 40%);">+```</span><br><span style="color: hsl(120, 100%, 40%);">+$ export IMAGE_SUFFIX="latest"</span><br><span style="color: hsl(120, 100%, 40%);">+$ cd ttcn3-mgw-test</span><br><span style="color: hsl(120, 100%, 40%);">+$ ./jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+```</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+latest-centos8:</span><br><span style="color: hsl(120, 100%, 40%);">+```</span><br><span style="color: hsl(120, 100%, 40%);">+$ export IMAGE_SUFFIX="latest-centos8"</span><br><span style="color: hsl(120, 100%, 40%);">+$ cd ttcn3-mgw-test</span><br><span style="color: hsl(120, 100%, 40%);">+$ ./jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+```</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+2021q1-centos8:</span><br><span style="color: hsl(120, 100%, 40%);">+```</span><br><span style="color: hsl(120, 100%, 40%);">+export OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"</span><br><span style="color: hsl(120, 100%, 40%);">+export OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"</span><br><span style="color: hsl(120, 100%, 40%);">+export OSMOCOM_REPO_PATH="osmo-maintained"</span><br><span style="color: hsl(120, 100%, 40%);">+export OSMOCOM_REPO_VERSION="2021q1"</span><br><span style="color: hsl(120, 100%, 40%);">+export IMAGE_SUFFIX="2021q1-centos8"</span><br><span style="color: hsl(120, 100%, 40%);">+$ cd ttcn3-mgw-test</span><br><span style="color: hsl(120, 100%, 40%);">+$ ./jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+```</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ## Kernel test</span><br><span> OsmoGGSN can be configured to either run completely in userspace, or to</span><br><span> use the GTP-U kernel module. To test the kernel module, OsmoGGSN and</span><br><span>diff --git a/jenkins-common.sh b/jenkins-common.sh</span><br><span>index 67a467d..e6a432d 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -6,7 +6,15 @@</span><br><span> }</span><br><span> </span><br><span> docker_depends() {</span><br><span style="color: hsl(120, 100%, 40%);">+ local feed</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> case "$1" in</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-20*q*-centos8)</span><br><span style="color: hsl(120, 100%, 40%);">+ # e.g. osmo-mgw-2021q1-centos8 -> centos8-obs-2021q1</span><br><span style="color: hsl(120, 100%, 40%);">+ feed="$(echo "$1" | grep -o -P -- "20\d\dq.*$")" # e.g. "2021q1-centos8"</span><br><span style="color: hsl(120, 100%, 40%);">+ feed="$(echo "$feed" | sed 's/\-centos8$//')" # e.g. "2021q1"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "centos8-obs-$feed"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span> osmo-*-latest-centos8) echo "centos8-obs-latest" ;;</span><br><span> osmo-*-centos8) echo "centos8-build" ;;</span><br><span> osmo-*-latest) echo "debian-stretch-obs-latest" ;;</span><br><span>@@ -34,8 +42,21 @@</span><br><span> </span><br><span> docker_dir_from_image_name() {</span><br><span> case "$1" in</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-*-centos8) echo "$1" | sed 's/\-centos8$//' ;;</span><br><span style="color: hsl(0, 100%, 40%);">- *) echo "$1" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-20*q*-centos8)</span><br><span style="color: hsl(120, 100%, 40%);">+ # e.g. osmo-mgw-2021q1-centos8 -> osmo-mgw-latest</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$1" | sed 's/20[0-9][0-9]q.*\-centos8$/latest/'</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*-centos8)</span><br><span style="color: hsl(120, 100%, 40%);">+ # e.g. osmo-mgw-latest-centos8 -> osmo-mgw-latest</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$1" | sed 's/\-centos8$//'</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ centos8-obs-20*q*)</span><br><span style="color: hsl(120, 100%, 40%);">+ # e.g. centos8-obs-2021q1 -> centos8-obs-latest</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$1" | sed 's/20[0-9][0-9]q.*$/latest/'</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *)</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$1"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span> esac</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/24118">change 24118</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/+/24118"/><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: Icf1e3f1928658ff3d82190c4176252cf3590a1f5 </div>
<div style="display:none"> Gerrit-Change-Number: 24118 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@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>