Attention is currently required from: pespin.
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29428 )
Change subject: scripts/obs/*.py: add option to ignore required programs check
......................................................................
Patch Set 1:
(1 comment)
File scripts/obs/lib/__init__.py:
https://gerrit.osmocom.org/c/osmo-ci/+/29428/comment/3d0ab55b_cef408c5
PS1, Line 36: parser.add_argument("-i", "--ignore-req", action="store_true",
> don't you need to se a default to false here?
Nope, argparse is smart enough to figure out that smth which isn't true is false.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29428
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I8b5eaedab87b586fb1ca4c22746be4dfbb3c2176
Gerrit-Change-Number: 29428
Gerrit-PatchSet: 1
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 21 Sep 2022 12:00:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29431 )
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/with-pfcp/HNBGW_Tests.cfg
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/31/29431/1
diff --git a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
index d3ea553..96609c2 100644
--- a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
+++ b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
@@ -7,6 +7,7 @@
# Local configuration below
[LOGGING]
+*.JUnitLogger.filename_stem := "junit-xml-with-pfcp"
[TESTPORT_PARAMETERS]
*.HNBGWVTY.CTRL_HOSTNAME := "172.18.35.20"
--
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-MessageType: newchange
Attention is currently required from: msuraev.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29428 )
Change subject: scripts/obs/*.py: add option to ignore required programs check
......................................................................
Patch Set 1:
(1 comment)
File scripts/obs/lib/__init__.py:
https://gerrit.osmocom.org/c/osmo-ci/+/29428/comment/2ff3733f_f0941b34
PS1, Line 36: parser.add_argument("-i", "--ignore-req", action="store_true",
don't you need to se a default to false here?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29428
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I8b5eaedab87b586fb1ca4c22746be4dfbb3c2176
Gerrit-Change-Number: 29428
Gerrit-PatchSet: 1
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 21 Sep 2022 09:56:32 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29430 )
Change subject: obs: update_obs_project: check if oscrc exists
......................................................................
obs: update_obs_project: check if oscrc exists
Check if the oscrc exists, as otherwise the osc command will
interactively prompt for the credentials. If running without verbose
mode (the default), the command output is hidden and so it would just
appear to be hanging without this patch if the config doesn't exist.
Change-Id: I6f140b2c1d171d3019fd259399e6a46da9c6451f
---
M scripts/obs/README
M scripts/obs/lib/osc.py
M scripts/obs/update_obs_project.py
3 files changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/30/29430/1
diff --git a/scripts/obs/README b/scripts/obs/README
index 67d2a2b..cd0955d 100644
--- a/scripts/obs/README
+++ b/scripts/obs/README
@@ -29,7 +29,7 @@
libosmo-pfcp
osmo-hnbgw
-FYI, the config file will look like this:
+FYI, the config file (oscrc) will look like this:
[general]
apiurl = https://obs.osmocom.org
diff --git a/scripts/obs/lib/osc.py b/scripts/obs/lib/osc.py
index 2fcdbc6..51e2f5f 100644
--- a/scripts/obs/lib/osc.py
+++ b/scripts/obs/lib/osc.py
@@ -20,6 +20,18 @@
exit(1)
+def check_oscrc():
+ configdir = os.environ.get("XDG_CONFIG_HOME", "~/.config")
+ paths = ["~/.oscrc", f"{configdir}/osc/oscrc"]
+ for path in paths:
+ if os.path.exists(os.path.expanduser(path)):
+ return
+
+ print("ERROR: oscrc does not exist, please create one as explained in the"
+ " README.")
+ exit(1)
+
+
def set_apiurl(url):
global apiurl
apiurl = url
diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py
index 02db7ce..61691f6 100755
--- a/scripts/obs/update_obs_project.py
+++ b/scripts/obs/update_obs_project.py
@@ -200,6 +200,7 @@
lib.docker.run_in_docker_and_exit(__file__, args, True)
lib.osc.check_proj(proj)
+ lib.osc.check_oscrc()
lib.osc.set_apiurl(args.apiurl)
lib.check_required_programs()
lib.remove_temp()
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29430
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6f140b2c1d171d3019fd259399e6a46da9c6451f
Gerrit-Change-Number: 29430
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange