Change in osmo-ci[master]: jobs: osmo-gsm-tester: Update path to sysmocom's specific setup

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

pespin gerrit-no-reply at lists.osmocom.org
Sat Apr 11 15:18:10 UTC 2020


pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17776 )

Change subject: jobs: osmo-gsm-tester: Update path to sysmocom's specific setup
......................................................................

jobs: osmo-gsm-tester: Update path to sysmocom's specific setup

Since osmo-gsm-tester.git I364e0859c0851b9167907a4d948b659a0f6a19fb the
example/ directory has been renamed to sysmocom/

Change-Id: I4c7516d2eb9636d37391a81dc9d484c0c04d7191
---
M jobs/osmo-gsm-tester-runner.yml
M jobs/osmo-gsm-tester_run-gerrit.sh
M jobs/osmo-gsm-tester_run-prod.sh
M jobs/osmo-gsm-tester_run-rnd.sh
M jobs/osmo-gsm-tester_ttcn3.sh
5 files changed, 18 insertions(+), 18 deletions(-)

Approvals:
  pespin: Looks good to me, approved; Verified



diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index d00ecfa..788f057 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -225,9 +225,9 @@
       - copy_artifact:
          repo: osmo-gsm-tester_build-osmocom-bb
       - shell: >
-            unlink osmo-gsm-tester/example/resources.conf || true
+            unlink osmo-gsm-tester/sysmocom/resources.conf || true
 
-            ln -s resources.conf.virtual osmo-gsm-tester/example/resources.conf
+            ln -s resources.conf.virtual osmo-gsm-tester/sysmocom/resources.conf
 
             # TODO: We (want to) grant CAP_SYS_NICE for osmo-bts-virtual
             # but with newer cgroup support and the --cpu-rt-runtime/--ulimit
@@ -236,7 +236,7 @@
             docker run --rm=true \
               -e HOME=/build \
               -e JOB_NAME="$JOB_NAME" \
-              -e OSMO_GSM_TESTER_CONF="/build/osmo-gsm-tester/example" \
+              -e OSMO_GSM_TESTER_CONF="/build/osmo-gsm-tester/sysmocom" \
               -e OSMO_GSM_TESTER_OPTS="$OSMO_GSM_TESTER_OPTS" \
               -e BUILD_NUMBER="$BUILD_NUMBER" \
               -w /build -i \
diff --git a/jobs/osmo-gsm-tester_run-gerrit.sh b/jobs/osmo-gsm-tester_run-gerrit.sh
index 4f250be..aa0c5d9 100644
--- a/jobs/osmo-gsm-tester_run-gerrit.sh
+++ b/jobs/osmo-gsm-tester_run-gerrit.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 set -e -x
 
-# On our hardware, we actually use the example configuration as-is.
-export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"
+# On our hardware, we actually use the sysmocom configuration as-is.
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/sysmocom"
 
 # debug: provoke a failure
 #export OSMO_GSM_TESTER_OPTS="-s debug -t fail"
 
-unlink osmo-gsm-tester/example/resources.conf || true
-ln -s resources.conf.prod osmo-gsm-tester/example/resources.conf
+unlink osmo-gsm-tester/sysmocom/resources.conf || true
+ln -s resources.conf.prod osmo-gsm-tester/sysmocom/resources.conf
 
 export OSMO_GSM_TESTER_OPTS="-s nitb_sms:sysmo -s sms:sysmo -s gprs:sysmo"
 ./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh
diff --git a/jobs/osmo-gsm-tester_run-prod.sh b/jobs/osmo-gsm-tester_run-prod.sh
index bcfe8ed..7614d10 100644
--- a/jobs/osmo-gsm-tester_run-prod.sh
+++ b/jobs/osmo-gsm-tester_run-prod.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 set -e -x
 
-# On our hardware, we actually use the example configuration as-is.
-export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"
+# On our hardware, we actually use the sysmocom configuration as-is.
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/sysmocom"
 
 # debug: provoke a failure
 #export OSMO_GSM_TESTER_OPTS="-s debug -t fail"
 
-unlink osmo-gsm-tester/example/resources.conf || true
-ln -s resources.conf.prod osmo-gsm-tester/example/resources.conf
+unlink osmo-gsm-tester/sysmocom/resources.conf || true
+ln -s resources.conf.prod osmo-gsm-tester/sysmocom/resources.conf
 
 PATH="$PWD/osmo-gsm-tester/src:$PATH" \
   ./osmo-gsm-tester/contrib/jenkins-run.sh
diff --git a/jobs/osmo-gsm-tester_run-rnd.sh b/jobs/osmo-gsm-tester_run-rnd.sh
index 1f8a58a..0bc7fcb 100644
--- a/jobs/osmo-gsm-tester_run-rnd.sh
+++ b/jobs/osmo-gsm-tester_run-rnd.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 set -e -x
 
-# On our hardware, we actually use the example configuration as-is.
-export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"
+# On our hardware, we actually use the sysmocom configuration as-is.
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/sysmocom"
 
 # debug: provoke a failure
 #export OSMO_GSM_TESTER_OPTS="-s debug -t fail"
 
-unlink osmo-gsm-tester/example/resources.conf || true
-ln -s resources.conf.rnd osmo-gsm-tester/example/resources.conf
+unlink osmo-gsm-tester/sysmocom/resources.conf || true
+ln -s resources.conf.rnd osmo-gsm-tester/sysmocom/resources.conf
 
 PATH="$PWD/osmo-gsm-tester/src:$PATH" \
   ./osmo-gsm-tester/contrib/jenkins-run.sh
diff --git a/jobs/osmo-gsm-tester_ttcn3.sh b/jobs/osmo-gsm-tester_ttcn3.sh
index a4d5e16..cb973fd 100644
--- a/jobs/osmo-gsm-tester_ttcn3.sh
+++ b/jobs/osmo-gsm-tester_ttcn3.sh
@@ -2,13 +2,13 @@
 set -e -x
 
 # On our hardware, we actually use the ttcn3 configuration as-is.
-export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/ttcn3"
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/sysmocom/ttcn3"
 
 # debug: provoke a failure
 #export OSMO_GSM_TESTER_OPTS="-s debug -t fail"
 
-unlink osmo-gsm-tester/ttcn3/resources.conf || true
-ln -s resources.conf.prod osmo-gsm-tester/ttcn3/resources.conf
+unlink osmo-gsm-tester/sysmocom/ttcn3/resources.conf || true
+ln -s resources.conf.prod osmo-gsm-tester/sysmocom/ttcn3/resources.conf
 
 PATH="$PWD/osmo-gsm-tester/src:$PATH" \
   ./osmo-gsm-tester/ttcn3/jenkins-run.sh

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17776
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I4c7516d2eb9636d37391a81dc9d484c0c04d7191
Gerrit-Change-Number: 17776
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200411/3e194aaf/attachment.htm>


More information about the gerrit-log mailing list