<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/17776">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  pespin: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jobs: osmo-gsm-tester: Update path to sysmocom's specific setup<br><br>Since osmo-gsm-tester.git I364e0859c0851b9167907a4d948b659a0f6a19fb the<br>example/ directory has been renamed to sysmocom/<br><br>Change-Id: I4c7516d2eb9636d37391a81dc9d484c0c04d7191<br>---<br>M jobs/osmo-gsm-tester-runner.yml<br>M jobs/osmo-gsm-tester_run-gerrit.sh<br>M jobs/osmo-gsm-tester_run-prod.sh<br>M jobs/osmo-gsm-tester_run-rnd.sh<br>M jobs/osmo-gsm-tester_ttcn3.sh<br>5 files changed, 18 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml</span><br><span>index d00ecfa..788f057 100644</span><br><span>--- a/jobs/osmo-gsm-tester-runner.yml</span><br><span>+++ b/jobs/osmo-gsm-tester-runner.yml</span><br><span>@@ -225,9 +225,9 @@</span><br><span>       - copy_artifact:</span><br><span>          repo: osmo-gsm-tester_build-osmocom-bb</span><br><span>       - shell: ></span><br><span style="color: hsl(0, 100%, 40%);">-            unlink osmo-gsm-tester/example/resources.conf || true</span><br><span style="color: hsl(120, 100%, 40%);">+            unlink osmo-gsm-tester/sysmocom/resources.conf || true</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-            ln -s resources.conf.virtual osmo-gsm-tester/example/resources.conf</span><br><span style="color: hsl(120, 100%, 40%);">+            ln -s resources.conf.virtual osmo-gsm-tester/sysmocom/resources.conf</span><br><span> </span><br><span>             # TODO: We (want to) grant CAP_SYS_NICE for osmo-bts-virtual</span><br><span>             # but with newer cgroup support and the --cpu-rt-runtime/--ulimit</span><br><span>@@ -236,7 +236,7 @@</span><br><span>             docker run --rm=true \</span><br><span>               -e HOME=/build \</span><br><span>               -e JOB_NAME="$JOB_NAME" \</span><br><span style="color: hsl(0, 100%, 40%);">-              -e OSMO_GSM_TESTER_CONF="/build/osmo-gsm-tester/example" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e OSMO_GSM_TESTER_CONF="/build/osmo-gsm-tester/sysmocom" \</span><br><span>               -e OSMO_GSM_TESTER_OPTS="$OSMO_GSM_TESTER_OPTS" \</span><br><span>               -e BUILD_NUMBER="$BUILD_NUMBER" \</span><br><span>               -w /build -i \</span><br><span>diff --git a/jobs/osmo-gsm-tester_run-gerrit.sh b/jobs/osmo-gsm-tester_run-gerrit.sh</span><br><span>index 4f250be..aa0c5d9 100644</span><br><span>--- a/jobs/osmo-gsm-tester_run-gerrit.sh</span><br><span>+++ b/jobs/osmo-gsm-tester_run-gerrit.sh</span><br><span>@@ -1,14 +1,14 @@</span><br><span> #!/bin/sh</span><br><span> set -e -x</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# On our hardware, we actually use the example configuration as-is.</span><br><span style="color: hsl(0, 100%, 40%);">-export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"</span><br><span style="color: hsl(120, 100%, 40%);">+# On our hardware, we actually use the sysmocom configuration as-is.</span><br><span style="color: hsl(120, 100%, 40%);">+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/sysmocom"</span><br><span> </span><br><span> # debug: provoke a failure</span><br><span> #export OSMO_GSM_TESTER_OPTS="-s debug -t fail"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unlink osmo-gsm-tester/example/resources.conf || true</span><br><span style="color: hsl(0, 100%, 40%);">-ln -s resources.conf.prod osmo-gsm-tester/example/resources.conf</span><br><span style="color: hsl(120, 100%, 40%);">+unlink osmo-gsm-tester/sysmocom/resources.conf || true</span><br><span style="color: hsl(120, 100%, 40%);">+ln -s resources.conf.prod osmo-gsm-tester/sysmocom/resources.conf</span><br><span> </span><br><span> export OSMO_GSM_TESTER_OPTS="-s nitb_sms:sysmo -s sms:sysmo -s gprs:sysmo"</span><br><span> ./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh</span><br><span>diff --git a/jobs/osmo-gsm-tester_run-prod.sh b/jobs/osmo-gsm-tester_run-prod.sh</span><br><span>index bcfe8ed..7614d10 100644</span><br><span>--- a/jobs/osmo-gsm-tester_run-prod.sh</span><br><span>+++ b/jobs/osmo-gsm-tester_run-prod.sh</span><br><span>@@ -1,14 +1,14 @@</span><br><span> #!/bin/sh</span><br><span> set -e -x</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# On our hardware, we actually use the example configuration as-is.</span><br><span style="color: hsl(0, 100%, 40%);">-export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"</span><br><span style="color: hsl(120, 100%, 40%);">+# On our hardware, we actually use the sysmocom configuration as-is.</span><br><span style="color: hsl(120, 100%, 40%);">+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/sysmocom"</span><br><span> </span><br><span> # debug: provoke a failure</span><br><span> #export OSMO_GSM_TESTER_OPTS="-s debug -t fail"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unlink osmo-gsm-tester/example/resources.conf || true</span><br><span style="color: hsl(0, 100%, 40%);">-ln -s resources.conf.prod osmo-gsm-tester/example/resources.conf</span><br><span style="color: hsl(120, 100%, 40%);">+unlink osmo-gsm-tester/sysmocom/resources.conf || true</span><br><span style="color: hsl(120, 100%, 40%);">+ln -s resources.conf.prod osmo-gsm-tester/sysmocom/resources.conf</span><br><span> </span><br><span> PATH="$PWD/osmo-gsm-tester/src:$PATH" \</span><br><span>   ./osmo-gsm-tester/contrib/jenkins-run.sh</span><br><span>diff --git a/jobs/osmo-gsm-tester_run-rnd.sh b/jobs/osmo-gsm-tester_run-rnd.sh</span><br><span>index 1f8a58a..0bc7fcb 100644</span><br><span>--- a/jobs/osmo-gsm-tester_run-rnd.sh</span><br><span>+++ b/jobs/osmo-gsm-tester_run-rnd.sh</span><br><span>@@ -1,14 +1,14 @@</span><br><span> #!/bin/sh</span><br><span> set -e -x</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# On our hardware, we actually use the example configuration as-is.</span><br><span style="color: hsl(0, 100%, 40%);">-export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"</span><br><span style="color: hsl(120, 100%, 40%);">+# On our hardware, we actually use the sysmocom configuration as-is.</span><br><span style="color: hsl(120, 100%, 40%);">+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/sysmocom"</span><br><span> </span><br><span> # debug: provoke a failure</span><br><span> #export OSMO_GSM_TESTER_OPTS="-s debug -t fail"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unlink osmo-gsm-tester/example/resources.conf || true</span><br><span style="color: hsl(0, 100%, 40%);">-ln -s resources.conf.rnd osmo-gsm-tester/example/resources.conf</span><br><span style="color: hsl(120, 100%, 40%);">+unlink osmo-gsm-tester/sysmocom/resources.conf || true</span><br><span style="color: hsl(120, 100%, 40%);">+ln -s resources.conf.rnd osmo-gsm-tester/sysmocom/resources.conf</span><br><span> </span><br><span> PATH="$PWD/osmo-gsm-tester/src:$PATH" \</span><br><span>   ./osmo-gsm-tester/contrib/jenkins-run.sh</span><br><span>diff --git a/jobs/osmo-gsm-tester_ttcn3.sh b/jobs/osmo-gsm-tester_ttcn3.sh</span><br><span>index a4d5e16..cb973fd 100644</span><br><span>--- a/jobs/osmo-gsm-tester_ttcn3.sh</span><br><span>+++ b/jobs/osmo-gsm-tester_ttcn3.sh</span><br><span>@@ -2,13 +2,13 @@</span><br><span> set -e -x</span><br><span> </span><br><span> # On our hardware, we actually use the ttcn3 configuration as-is.</span><br><span style="color: hsl(0, 100%, 40%);">-export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/ttcn3"</span><br><span style="color: hsl(120, 100%, 40%);">+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/sysmocom/ttcn3"</span><br><span> </span><br><span> # debug: provoke a failure</span><br><span> #export OSMO_GSM_TESTER_OPTS="-s debug -t fail"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unlink osmo-gsm-tester/ttcn3/resources.conf || true</span><br><span style="color: hsl(0, 100%, 40%);">-ln -s resources.conf.prod osmo-gsm-tester/ttcn3/resources.conf</span><br><span style="color: hsl(120, 100%, 40%);">+unlink osmo-gsm-tester/sysmocom/ttcn3/resources.conf || true</span><br><span style="color: hsl(120, 100%, 40%);">+ln -s resources.conf.prod osmo-gsm-tester/sysmocom/ttcn3/resources.conf</span><br><span> </span><br><span> PATH="$PWD/osmo-gsm-tester/src:$PATH" \</span><br><span>   ./osmo-gsm-tester/ttcn3/jenkins-run.sh</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/17776">change 17776</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/osmo-ci/+/17776"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4c7516d2eb9636d37391a81dc9d484c0c04d7191 </div>
<div style="display:none"> Gerrit-Change-Number: 17776 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>