- gerrit-log - lists.osmocom.org

Change in docker-playground[master]: ttcn3-bts: Add missing docker container kill at the end
by pespin 21 Sep '22

21 Sep '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29434 ) Change subject: ttcn3-bts: Add missing docker container kill at the end ...................................................................... ttcn3-bts: Add missing docker container kill at the end Change-Id: Id960c68b9b0781625b7ac567ad004dfdc230ffbb --- M ttcn3-bts-test/jenkins.sh 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/34/29434/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 3438771..9d956da 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -211,3 +211,8 @@ start_bsc start_bts trx 1 start_testsuite hopping + +docker container kill ${BUILD_TAG}-trxcon +docker container kill ${BUILD_TAG}-fake_trx +docker container kill ${BUILD_TAG}-bts +docker container kill ${BUILD_TAG}-bsc \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id960c68b9b0781625b7ac567ad004dfdc230ffbb Gerrit-Change-Number: 29434 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ci[master]: build_srcpkg.py: add option to use git-review
by msuraev 21 Sep '22

21 Sep '22

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29427 ) Change subject: build_srcpkg.py: add option to use git-review ...................................................................... build_srcpkg.py: add option to use git-review Having an option to explicitly checkout sources for package from gerrit using numeric ID comes in handy for testing changes. Related: OS#4107 Change-Id: I403c2083ef8c3f6f966c5b376fb13ea46d8a7a2b --- M scripts/obs/build_srcpkg.py M scripts/obs/data/Dockerfile M scripts/obs/lib/config.py M scripts/obs/lib/git.py M scripts/obs/lib/srcpkg.py 5 files changed, 17 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, approved diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py index 066d370..262ead8 100755 --- a/scripts/obs/build_srcpkg.py +++ b/scripts/obs/build_srcpkg.py @@ -18,6 +18,8 @@ " upload to https://obs.osmocom.org." f" Output dir: {lib.config.path_temp}/srcpkgs") lib.add_shared_arguments(parser) + parser.add_argument("-g", "--gerrit-id", type=int, default=0, + help="clone particular revision from gerrit using given ID") parser.add_argument("package", nargs="?", help="package name, e.g. libosmocore or open5gs") args = parser.parse_args() @@ -43,7 +45,7 @@ if args.package: lib.srcpkg.build(args.package, args.feed, args.git_branch, args.conflict_version, - args.git_fetch) + args.git_fetch, args.gerrit_id) if __name__ == "__main__": diff --git a/scripts/obs/data/Dockerfile b/scripts/obs/data/Dockerfile index d8bd9c5..f5d72cd 100644 --- a/scripts/obs/data/Dockerfile +++ b/scripts/obs/data/Dockerfile @@ -23,6 +23,7 @@ dpkg-dev \ fakeroot \ git \ + git-review \ meson \ osc \ python3-setuptools \ diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 1e569ef..c9df74a 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -17,6 +17,7 @@ "fakeroot", "find", "git", + "git-review", "meson", "osc", "rebar3", diff --git a/scripts/obs/lib/git.py b/scripts/obs/lib/git.py index 29c183b..8dc57ae 100644 --- a/scripts/obs/lib/git.py +++ b/scripts/obs/lib/git.py @@ -58,6 +58,13 @@ lib.run_cmd(["git", "reset", "--hard", branch], cwd=repo_path) +def checkout_from_review(project, gerrit_id): + """ checkout a given gerrit ID """ + repo_path = get_repo_path(project) + lib.run_cmd(["git", "review", "-s"], cwd=repo_path) + lib.run_cmd(["git", "review", "-d", str(gerrit_id)], cwd=repo_path) + + def checkout_default_branch(project): branch = lib.config.git_branch_default if project in lib.config.git_branch_other: diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 035cf81..159f4ed 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -117,10 +117,13 @@ f.write(f"{version}\n") -def build(project, feed, branch, conflict_version, fetch): +def build(project, feed, branch, conflict_version, fetch, gerrit_id=0): lib.git.clone(project, fetch) lib.git.clean(project) - checkout_for_feed(project, feed, branch) + if gerrit_id > 0: + lib.git.checkout_from_review(project, gerrit_id) + else: + checkout_for_feed(project, feed, branch) version = get_version_for_feed(project, feed, conflict_version) epoch = get_epoch(project) version_epoch = f"{epoch}:{version}" if epoch else version 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I403c2083ef8c3f6f966c5b376fb13ea46d8a7a2b Gerrit-Change-Number: 29427 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: scripts/obs/*.py: add option to ignore required programs check
by msuraev 21 Sep '22

21 Sep '22

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29428 ) Change subject: scripts/obs/*.py: add option to ignore required programs check ...................................................................... scripts/obs/*.py: add option to ignore required programs check Not all the required programs are actually required to build subset of packages. Add option to ignore the default check. Change-Id: I8b5eaedab87b586fb1ca4c22746be4dfbb3c2176 --- M scripts/obs/build_srcpkg.py M scripts/obs/lib/__init__.py M scripts/obs/update_obs_project.py 3 files changed, 9 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py index ea7ab34..066d370 100755 --- a/scripts/obs/build_srcpkg.py +++ b/scripts/obs/build_srcpkg.py @@ -31,7 +31,9 @@ if args.docker: lib.docker.run_in_docker_and_exit(__file__, args) - lib.check_required_programs() + if not args.ignore_req: + lib.check_required_programs() + if args.package: lib.check_package(args.package) lib.remove_temp() diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 1ed5ef5..f94c0a8 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -33,6 +33,8 @@ action="store_false", dest="git_fetch") parser.add_argument("-m", "--meta", action="store_true", help="build a meta package (e.g. osmocom-nightly)") + parser.add_argument("-i", "--ignore-req", action="store_true", + help="skip required programs check") parser.add_argument("-c", "--conflict-version", nargs="?", help="Of the generated source packages, all Osmocom" " packages (not e.g. open5gs, see lib/config.py" diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 61691f6..aa33984 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -202,7 +202,10 @@ lib.osc.check_proj(proj) lib.osc.check_oscrc() lib.osc.set_apiurl(args.apiurl) - lib.check_required_programs() + + if not args.ignore_req: + lib.check_required_programs() + lib.remove_temp() pkgs_remote = lib.osc.get_remote_pkgs(proj) -- 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: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: scripts/obs/*.py: add option to ignore required programs check
by msuraev 21 Sep '22

21 Sep '22

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: -Code-Review (1 comment) File scripts/obs/lib/__init__.py: https://gerrit.osmocom.org/c/osmo-ci/+/29428/comment/79f32f41_63979321 PS1, Line 36: parser.add_argument("-i", "--ignore-req", action="store_true", > Nope, argparse is smart enough to figure out that smth which isn't true is false. OK -- 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: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 14:27:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: scripts/obs/*.py: add option to ignore required programs check
by msuraev 21 Sep '22

21 Sep '22

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: Code-Review+2 -- 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: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 14:26:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: obs: update_obs_project: check if oscrc exists
by osmith 21 Sep '22

21 Sep '22

osmith has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: obs: lib.run_cmd: set stdin to subprocess.DEVNULL
by osmith 21 Sep '22

21 Sep '22

osmith has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 58fe0e4..1ed5ef5 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -119,9 +119,9 @@ print(f"+ {caller}(): {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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: obs: don't print verbose output twice on error
by osmith 21 Sep '22

21 Sep '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29429 ) Change subject: obs: don't print verbose output twice on error ...................................................................... obs: don't print verbose output twice on error When running in verbose mode, it's enough that the output is displayed while the command is running. Don't print it again on error. Change-Id: I4fcf2421a6f82bd94ba098b39f58e5d3f18aa8fd --- M scripts/obs/lib/__init__.py 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index d66aa3b..58fe0e4 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -88,12 +88,17 @@ def exit_error_cmd(completed, error_msg): """ :param completed: return from run_cmd() below """ + global cmds_verbose + print() print(f"ERROR: {error_msg}") print() print(f"*** command ***\n{completed.args}\n") print(f"*** returncode ***\n{completed.returncode}\n") - print(f"*** output ***\n{completed.output}") + + if not cmds_verbose: + print(f"*** output ***\n{completed.output}") + print("*** python trace ***") raise RuntimeError("shell command related error, find details right above" " this python trace") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4fcf2421a6f82bd94ba098b39f58e5d3f18aa8fd Gerrit-Change-Number: 29429 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: obs: lib.run_cmd: set stdin to subprocess.DEVNULL
by osmith 21 Sep '22

21 Sep '22

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29433 ) Change subject: obs: lib.run_cmd: set stdin to subprocess.DEVNULL ...................................................................... Patch Set 1: Code-Review+2 -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 14:17:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: obs: update_obs_project: check if oscrc exists
by osmith 21 Sep '22

21 Sep '22

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29430 ) Change subject: obs: update_obs_project: check if oscrc exists ...................................................................... Patch Set 1: Code-Review+2 -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 14:17:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log