<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/24317">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jenkins-common.sh: add image_suffix_is_latest<br><br>Make sure we run the latest-code paths for "latest-centos8" too.<br><br>Change-Id: Ibcc7dfb092b3766ef9b189ae990b43fdb746a022<br>---<br>M jenkins-common.sh<br>M ttcn3-pcu-test/jenkins.sh<br>M ttcn3-sgsn-test/jenkins.sh<br>M ttcn3-stp-test/jenkins.sh<br>4 files changed, 11 insertions(+), 3 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/17/24317/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 e6a432d..36f7e9c 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -335,6 +335,14 @@</span><br><span>         exit 1</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Check if IMAGE_SUFFIX starts with "latest" (e.g. "latest-centos8")</span><br><span style="color: hsl(120, 100%, 40%);">+image_suffix_is_latest() {</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$IMAGE_SUFFIX" in</span><br><span style="color: hsl(120, 100%, 40%);">+     latest*) return 0 ;;</span><br><span style="color: hsl(120, 100%, 40%);">+  *) return 1 ;;</span><br><span style="color: hsl(120, 100%, 40%);">+        esac</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> set -x</span><br><span> </span><br><span> # non-jenkins execution: assume local user name</span><br><span>diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh</span><br><span>index c597e0e..606f1f5 100755</span><br><span>--- a/ttcn3-pcu-test/jenkins.sh</span><br><span>+++ b/ttcn3-pcu-test/jenkins.sh</span><br><span>@@ -17,7 +17,7 @@</span><br><span> cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/</span><br><span> </span><br><span> # Disable until osmo-pcu release > 0.9.0</span><br><span style="color: hsl(0, 100%, 40%);">-if [ "$IMAGE_SUFFIX" = "latest" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+if image_suffix_is_latest; then</span><br><span>         sed -i "s/^PCUIF_Components.mp_send_all_data_ind.*/PCUIF_Components.mp_send_all_data_ind := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg</span><br><span> fi</span><br><span> </span><br><span>diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh</span><br><span>index 654a882..05f7945 100755</span><br><span>--- a/ttcn3-sgsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-sgsn-test/jenkins.sh</span><br><span>@@ -25,7 +25,7 @@</span><br><span> mkdir $VOL_BASE_DIR/unix</span><br><span> </span><br><span> # Disable until osmo-sgsn.git release > 1.7.0 is available</span><br><span style="color: hsl(0, 100%, 40%);">-if [ "$IMAGE_SUFFIX" = "latest" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+if image_suffix_is_latest; then</span><br><span>        sed "/mme test-mme0/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg</span><br><span>   sed "/gtp remote-ip/d" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg</span><br><span>         sed "/gtp ran-info-relay/d" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg</span><br><span>diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh</span><br><span>index 9d8dc8c..cecd07c 100755</span><br><span>--- a/ttcn3-stp-test/jenkins.sh</span><br><span>+++ b/ttcn3-stp-test/jenkins.sh</span><br><span>@@ -16,7 +16,7 @@</span><br><span> cp osmo-stp.cfg $VOL_BASE_DIR/stp/</span><br><span> </span><br><span> # Disable until osmo-stp release > 1.4.0</span><br><span style="color: hsl(0, 100%, 40%);">-if [ "$IMAGE_SUFFIX" = "latest" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+if image_suffix_is_latest; then</span><br><span>  sed -i "s/^STP_Tests_M3UA.mp_stp_has_asp_quirk.*/STP_Tests_M3UA.mp_stp_has_asp_quirk := false;/" $VOL_BASE_DIR/stp-tester/STP_Tests.cfg</span><br><span> fi</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/24317">change 24317</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/+/24317"/><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: Ibcc7dfb092b3766ef9b189ae990b43fdb746a022 </div>
<div style="display:none"> Gerrit-Change-Number: 24317 </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-MessageType: newchange </div>