osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30427 )
Change subject: jobs/osmo-gsm-tester virtual: fix opts desciption
......................................................................
jobs/osmo-gsm-tester virtual: fix opts desciption
The default value is what it says in the line above, not empty.
Change-Id: I5ce8a47b43525dcca6bf54184a48f11b0c87c19e
---
M jobs/osmo-gsm-tester-runner.yml
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/27/30427/1
diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index 739bb61..0e866ac 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -265,7 +265,7 @@
- string:
name: "OSMO_GSM_TESTER_OPTS"
default: "-s netreg_mass"
- description: "pass additional command line options to osmo-gsm-tester.py, e.g. to select specific suites:scenarios. Default: leave empty."
+ description: "pass additional command line options to osmo-gsm-tester.py, e.g. to select specific suites:scenarios"
- string:
name: "OSMO_GSM_TESTER_BRANCH"
default: "master"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30427
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I5ce8a47b43525dcca6bf54184a48f11b0c87c19e
Gerrit-Change-Number: 30427
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30425 )
Change subject: jobs/osmo-gsm-tester virtual: fix docker img
......................................................................
jobs/osmo-gsm-tester virtual: fix docker img
Build the docker image right before using it, instead of building it in
another jenkins job update-osmo-ci-on-slaves via
osmo-ci-docker-rebuild.sh.
The logic in osmo-ci-docker-rebuild.sh was broken. I didn't realize at
the time that this image is only used for the virtual osmo-gsm-tester,
not the physical ones. But only the machines running the physical
osmo-gsm-tester have the /var/tmp/osmo-gsm-tester/state path. The
virtual osmo-gsm-tester isn't running on these machines but on generic
jenkins nodes.
Building the image right before using it makes sense for this job, as it
is the only user of the image. If it was already built from the same
Dockerfile, a cached version is used.
Fix for:
Unable to find image 'osmocom-build/osmo-gsm-tester:latest' locally
Fixes: 9139e76b ("osmo-ci-docker-rebuild: don't always build osmo-gsm-tester")
Change-Id: Icad9459de1d3a3a4e65ecacf7f903433bb504cc9
---
M jobs/osmo-gsm-tester-runner.yml
M scripts/osmo-ci-docker-rebuild.sh
2 files changed, 14 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/25/30425/1
diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index bff2a9b..814c0c9 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -224,6 +224,16 @@
- copy_artifact:
repo: osmo-gsm-tester_build-osmocom-bb
- shell: |
+ # Build the docker image
+ rm -rf docker-playground
+ git clone \
+ --depth=1 \
+ --branch="$DOCKER_PLAYGROUND_BRANCH" \
+ https://gerrit.osmocom.org/docker-playground \
+ docker-playground
+ git -C docker-playground log --oneline
+ make -C docker-playground/osmo-gsm-tester
+
unlink osmo-gsm-tester/sysmocom/resources.conf || true
ln -s resources.conf.virtual osmo-gsm-tester/sysmocom/resources.conf
@@ -260,3 +270,7 @@
name: "OSMO_GSM_TESTER_BRANCH"
default: "master"
description: "Which branch/sha should be used for testing"
+ - string:
+ name: "DOCKER_PLAYGROUND_BRANCH"
+ default: "master"
+ description: "Which branch/sha should be used for building the osmo-gsm-tester docker container"
diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh
index 9c2aae6..f409d45 100755
--- a/scripts/osmo-ci-docker-rebuild.sh
+++ b/scripts/osmo-ci-docker-rebuild.sh
@@ -10,8 +10,3 @@
"debian-bullseye-erlang" \
"debian-bullseye-jenkins"
fi
-
-if [ -d "/var/tmp/osmo-gsm-tester/state" ]; then
- docker_images_require \
- "osmo-gsm-tester"
-fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30425
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Icad9459de1d3a3a4e65ecacf7f903433bb504cc9
Gerrit-Change-Number: 30425
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin, fixeria.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30415 )
Change subject: vita demod by piotr krysik, modified
......................................................................
Patch Set 3:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-trx/+/30415/comment/57c38754_c059e099
PS2, Line 7: by piotr krysik
> Commit message should ideally state where the code is imported from, including the commit hash if it […]
Done
File Transceiver52M/grgsm_vitac/viterbi_detector.cc:
https://gerrit.osmocom.org/c/osmo-trx/+/30415/comment/c83d3f0f_fdee178b
PS2, Line 1: /* -*- c++ -*- */
> All files are named ".cpp", why is this one named ". […]
nothing to fix here, this file is a literal copy of the grgsm code and it should stay that way, also obove.
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30415
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I5466c522cf4de984a4810ec46df43a10b52ed78f
Gerrit-Change-Number: 30415
Gerrit-PatchSet: 3
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 01 Dec 2022 14:43:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30413 )
Change subject: bladerf xa4 support
......................................................................
Patch Set 2:
(2 comments)
File Transceiver52M/device/bladerf/bladerf.cpp:
https://gerrit.osmocom.org/c/osmo-trx/+/30413/comment/62fe1f31_f2262ca9
PS1, Line 432: // Initialize and shadow gain values
> The file is literally copypasted from the b210 code and those comments are useless anyway...
Done
https://gerrit.osmocom.org/c/osmo-trx/+/30413/comment/cc218d2d_eff7db90
PS1, Line 727: #ifndef IPCMAGIC
> This is related to the ipc interface test that uses the uhd backend for the ipc side,which is where […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30413
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I455c34bb9520d5f09eeb1ac76fceb4bdea94d1ac
Gerrit-Change-Number: 30413
Gerrit-PatchSet: 2
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 01 Dec 2022 14:42:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment