<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11368">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rename m3ua-test, sua-test to nplab-*-test<br><br>Allows writing a generic Jenkins Job Builder config by renaming the<br>container folders to match the job names. This needs changes in the<br>Jenkins jobs, as done in Ie433925ee81a61c5788b4a6f2bc5b89c2689d251.<br><br>Related: OS#3268<br>Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de<br>---<br>R nplab-m3ua-test/.release<br>R nplab-m3ua-test/Dockerfile<br>R nplab-m3ua-test/Makefile<br>R nplab-m3ua-test/all-sgp-tests.txt<br>R nplab-m3ua-test/dotguile<br>R nplab-m3ua-test/jenkins.sh<br>R nplab-m3ua-test/m3ua-param-testtool.scm<br>R nplab-m3ua-test/osmo-stp.cfg<br>R nplab-sua-test/.release<br>R nplab-sua-test/Dockerfile<br>R nplab-sua-test/Makefile<br>R nplab-sua-test/dotguile<br>R nplab-sua-test/jenkins.sh<br>R nplab-sua-test/osmo-stp.cfg<br>R nplab-sua-test/some-sua-sgp-tests.txt<br>R nplab-sua-test/sua-param-testtool-sgp.scm<br>16 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/m3ua-test/.release b/nplab-m3ua-test/.release</span><br><span>similarity index 100%</span><br><span>rename from m3ua-test/.release</span><br><span>rename to nplab-m3ua-test/.release</span><br><span>diff --git a/m3ua-test/Dockerfile b/nplab-m3ua-test/Dockerfile</span><br><span>similarity index 100%</span><br><span>rename from m3ua-test/Dockerfile</span><br><span>rename to nplab-m3ua-test/Dockerfile</span><br><span>diff --git a/m3ua-test/Makefile b/nplab-m3ua-test/Makefile</span><br><span>similarity index 100%</span><br><span>rename from m3ua-test/Makefile</span><br><span>rename to nplab-m3ua-test/Makefile</span><br><span>diff --git a/m3ua-test/all-sgp-tests.txt b/nplab-m3ua-test/all-sgp-tests.txt</span><br><span>similarity index 100%</span><br><span>rename from m3ua-test/all-sgp-tests.txt</span><br><span>rename to nplab-m3ua-test/all-sgp-tests.txt</span><br><span>diff --git a/m3ua-test/dotguile b/nplab-m3ua-test/dotguile</span><br><span>similarity index 100%</span><br><span>rename from m3ua-test/dotguile</span><br><span>rename to nplab-m3ua-test/dotguile</span><br><span>diff --git a/m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh</span><br><span>similarity index 90%</span><br><span>rename from m3ua-test/jenkins.sh</span><br><span>rename to nplab-m3ua-test/jenkins.sh</span><br><span>index e69e827..800c5b2 100755</span><br><span>--- a/m3ua-test/jenkins.sh</span><br><span>+++ b/nplab-m3ua-test/jenkins.sh</span><br><span>@@ -6,7 +6,7 @@</span><br><span> "debian-jessie-build" \</span><br><span> "osmo-stp-$IMAGE_SUFFIX" \</span><br><span> "debian-stretch-titan" \</span><br><span style="color: hsl(0, 100%, 40%);">- "m3ua-test"</span><br><span style="color: hsl(120, 100%, 40%);">+ "nplab-m3ua-test"</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/m3ua-tester</span><br><span> cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/</span><br><span>@@ -29,7 +29,7 @@</span><br><span> --network $NET_NAME --ip 172.18.7.2 \</span><br><span> -v $VOL_BASE_DIR/m3ua-tester:/data \</span><br><span> --name ${BUILD_TAG}-m3ua-test \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/m3ua-test > $WORKSPACE/logs/junit-xml-m3ua.log</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/nplab-m3ua-test > $WORKSPACE/logs/junit-xml-m3ua.log</span><br><span> </span><br><span> docker container stop -t 1 ${BUILD_TAG}-stp</span><br><span> </span><br><span>diff --git a/m3ua-test/m3ua-param-testtool.scm b/nplab-m3ua-test/m3ua-param-testtool.scm</span><br><span>similarity index 100%</span><br><span>rename from m3ua-test/m3ua-param-testtool.scm</span><br><span>rename to nplab-m3ua-test/m3ua-param-testtool.scm</span><br><span>diff --git a/m3ua-test/osmo-stp.cfg b/nplab-m3ua-test/osmo-stp.cfg</span><br><span>similarity index 100%</span><br><span>rename from m3ua-test/osmo-stp.cfg</span><br><span>rename to nplab-m3ua-test/osmo-stp.cfg</span><br><span>diff --git a/sua-test/.release b/nplab-sua-test/.release</span><br><span>similarity index 100%</span><br><span>rename from sua-test/.release</span><br><span>rename to nplab-sua-test/.release</span><br><span>diff --git a/sua-test/Dockerfile b/nplab-sua-test/Dockerfile</span><br><span>similarity index 100%</span><br><span>rename from sua-test/Dockerfile</span><br><span>rename to nplab-sua-test/Dockerfile</span><br><span>diff --git a/sua-test/Makefile b/nplab-sua-test/Makefile</span><br><span>similarity index 100%</span><br><span>rename from sua-test/Makefile</span><br><span>rename to nplab-sua-test/Makefile</span><br><span>diff --git a/sua-test/dotguile b/nplab-sua-test/dotguile</span><br><span>similarity index 100%</span><br><span>rename from sua-test/dotguile</span><br><span>rename to nplab-sua-test/dotguile</span><br><span>diff --git a/sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh</span><br><span>similarity index 91%</span><br><span>rename from sua-test/jenkins.sh</span><br><span>rename to nplab-sua-test/jenkins.sh</span><br><span>index 5e8d4cb..fea5cf0 100755</span><br><span>--- a/sua-test/jenkins.sh</span><br><span>+++ b/nplab-sua-test/jenkins.sh</span><br><span>@@ -7,7 +7,7 @@</span><br><span> "osmo-stp-$IMAGE_SUFFIX" \</span><br><span> "debian-stretch-titan" \</span><br><span> "sigtran-tests" \</span><br><span style="color: hsl(0, 100%, 40%);">- "sua-test"</span><br><span style="color: hsl(120, 100%, 40%);">+ "nplab-sua-test"</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/sua-tester</span><br><span> cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/</span><br><span>@@ -30,7 +30,7 @@</span><br><span> --network $NET_NAME --ip 172.18.6.3 \</span><br><span> -v $VOL_BASE_DIR/sua-tester:/data \</span><br><span> --name ${BUILD_TAG}-sua-test \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/sua-test > $VOL_BASE_DIR/junit-xml-sua.log</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/nplab-sua-test > $VOL_BASE_DIR/junit-xml-sua.log</span><br><span> </span><br><span> docker container stop -t 1 ${BUILD_TAG}-stp</span><br><span> </span><br><span>diff --git a/sua-test/osmo-stp.cfg b/nplab-sua-test/osmo-stp.cfg</span><br><span>similarity index 100%</span><br><span>rename from sua-test/osmo-stp.cfg</span><br><span>rename to nplab-sua-test/osmo-stp.cfg</span><br><span>diff --git a/sua-test/some-sua-sgp-tests.txt b/nplab-sua-test/some-sua-sgp-tests.txt</span><br><span>similarity index 100%</span><br><span>rename from sua-test/some-sua-sgp-tests.txt</span><br><span>rename to nplab-sua-test/some-sua-sgp-tests.txt</span><br><span>diff --git a/sua-test/sua-param-testtool-sgp.scm b/nplab-sua-test/sua-param-testtool-sgp.scm</span><br><span>similarity index 100%</span><br><span>rename from sua-test/sua-param-testtool-sgp.scm</span><br><span>rename to nplab-sua-test/sua-param-testtool-sgp.scm</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11368">change 11368</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/11368"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iedf9a8cd9af1da674e018a08a977490520e602de </div>
<div style="display:none"> Gerrit-Change-Number: 11368 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>