osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29433 )
Change subject: obs: lib.run_cmd: set stdin to subprocess.DEVNULL
......................................................................
obs: lib.run_cmd: set stdin to subprocess.DEVNULL
Don't pass stdin to the programs, as we expect them to run
non-interactively and also don't show the program's output unless -v is
used or the exit code is not 0.
Change-Id: I7e893101c2a3e7b005659ec72aa44fa932b7ccd9
---
M scripts/obs/lib/__init__.py
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/33/29433/1
diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py
index f2790d0..d494fc6 100644
--- a/scripts/obs/lib/__init__.py
+++ b/scripts/obs/lib/__init__.py
@@ -117,9 +117,9 @@
print(f"+ {cmd}")
with tempfile.TemporaryFile(encoding="utf8", mode="w+") as output_buf:
- p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT, text=True, bufsize=1,
- *args, **kwargs)
+ p = subprocess.Popen(cmd, stdin=subprocess.DEVNULL,
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+ text=True, bufsize=1, *args, **kwargs)
while True:
out = p.stdout.read(1)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29433
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I7e893101c2a3e7b005659ec72aa44fa932b7ccd9
Gerrit-Change-Number: 29433
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29432 )
Change subject: ttcn3-hnbgw: sed junit file in the clean_up trap
......................................................................
ttcn3-hnbgw: sed junit file in the clean_up trap
Same as done in BTS_Tests. This makes sure the files are always properly
updated even if something goes wrong (such as docker kill failing to
stop hnbgw because it exited earlier due to unsupported feature).
Change-Id: Iac3bd9cf3448e18930dcef6c9ae4b6530939ffe6
---
M ttcn3-hnbgw-test/jenkins.sh
1 file changed, 9 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/32/29432/1
diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh
index 10bb428..8c1ddf5 100755
--- a/ttcn3-hnbgw-test/jenkins.sh
+++ b/ttcn3-hnbgw-test/jenkins.sh
@@ -10,6 +10,15 @@
set_clean_up_trap
set -e
+VOL_BASE_DIR_PFCP="$VOL_BASE_DIR/with-pfcp"
+clean_up() {
+ # append ':with-pfcp' to the classnames,
+ # e.g. "classname='HNBGW_Tests'" => "classname='HNBGW_Tests:with-pfcp'"
+ # so the with-pfcp test cases would not interfere without pfcp ones in Jenkins
+ sed -i "s/classname='\([^']\+\)'/classname='\1:with-pfcp'/g" \
+ $VOL_BASE_DIR_PFCP/hnbgw-tester/junit-xml-with-pfcp-*.log
+}
+
SUBNET=35
network_create $SUBNET
@@ -72,9 +81,5 @@
run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" "osmo-stp.cfg" "osmo-hnbgw.cfg"
echo Testing with PFCP
-VOL_BASE_DIR_PFCP="$VOL_BASE_DIR/with-pfcp"
mkdir "$VOL_BASE_DIR_PFCP"
run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg"
-# Make jenkins results show ':with-pfcp': append ':with-pfcp' to the jenkins results classnames
-sed -i "s/classname='\([^']\+\)'/classname='\1:with-pfcp'/g" \
- $VOL_BASE_DIR_PFCP/hnbgw-tester/junit-xml-with-pfcp-*.log
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29432
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Iac3bd9cf3448e18930dcef6c9ae4b6530939ffe6
Gerrit-Change-Number: 29432
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin, fixeria.
Hello Jenkins Builder, neels, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/docker-playground/+/29431
to look at the new patch set (#2).
Change subject: ttcn3-hnbgw: Set different junit xml file name prefix for with-pfcp variant
......................................................................
ttcn3-hnbgw: Set different junit xml file name prefix for with-pfcp variant
Similar to what's done in BTS_Tests and REMSIM_Tests
Change-Id: Iee69774ae8885ab216d0d707ee5fd0269a438c83
---
M ttcn3-hnbgw-test/jenkins.sh
M ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/31/29431/2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29431
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Iee69774ae8885ab216d0d707ee5fd0269a438c83
Gerrit-Change-Number: 29431
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: pespin, fixeria.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29431 )
Change subject: ttcn3-hnbgw: Set different junit xml file name prefix for with-pfcp variant
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
Patchset:
PS1:
i deemed it not necessary since that file is in a different subdir
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29431
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Iee69774ae8885ab216d0d707ee5fd0269a438c83
Gerrit-Change-Number: 29431
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 21 Sep 2022 12:32:15 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment