September 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ci[master]: obs: update_obs_project: check if oscrc exists

by osmith

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

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: obs: don't print verbose output twice on error

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/29429/1 diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index a07a072..f2790d0 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -87,12 +87,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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: build_srcpkg.py: add option to use git-review

by osmith

Attention is currently required from: msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29427 ) Change subject: build_srcpkg.py: add option to use git-review ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Patchset: PS3: Nice! Related: soon gerrit will automatically build rpms and debs from the submitted patches: https://osmocom.org/issues/2385 -- 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: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 09:26:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: scripts/obs/*.py: log name of function calling command

by osmith

Attention is currently required from: msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29426 ) Change subject: scripts/obs/*.py: log name of function calling command ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: If it helps understand the code, sure. Maybe instead of the function name, print the file name and line that called it? current output with this patch: libosmocore: adding debian/changelog entry (1.7.0 => 1.7.0.38-c3b90) + build(): ['find', '/home/user/code/osmo-dev/src/osmo-ci/scripts/obs/_cache', '-maxdepth', '1', '-type', 'f', '-delete'] libosmocore: building debian source package + build(): ['dpkg-buildpackage', '-S', '-uc', '-us', '-d'] -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If4ccc0eb44da4ea743f3858b09c762ee6a138f1d Gerrit-Change-Number: 29426 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 09:20:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: scripts/obs/*.py: add option to ignore required programs check

by osmith

Attention is currently required from: msuraev. osmith 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 -- 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-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 09:16:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: scripts/obs/*.py: log name of function calling command

by osmith

Attention is currently required from: msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29426 ) Change subject: scripts/obs/*.py: log name of function calling command ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If4ccc0eb44da4ea743f3858b09c762ee6a138f1d Gerrit-Change-Number: 29426 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 09:15:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: scripts/obs/*.py: add option to ignore required programs check

by msuraev

Attention is currently required from: osmith. 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: This change is ready for review. -- 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 04:52:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: build_srcpkg.py: add option to use git-review

by msuraev

Attention is currently required from: osmith. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/29427 to look at the new patch set (#3). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/27/29427/3 -- 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: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: build_srcpkg.py: add option to use git-review

by msuraev

Attention is currently required from: osmith. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29427 ) Change subject: build_srcpkg.py: add option to use git-review ...................................................................... Set Ready For Review -- 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: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 04:27:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: scripts/obs/*.py: log name of function calling command

by msuraev

Attention is currently required from: osmith. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/29426 to look at the new patch set (#2). Change subject: scripts/obs/*.py: log name of function calling command ...................................................................... scripts/obs/*.py: log name of function calling command Change-Id: If4ccc0eb44da4ea743f3858b09c762ee6a138f1d --- M scripts/obs/lib/__init__.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/26/29426/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If4ccc0eb44da4ea743f3858b09c762ee6a138f1d Gerrit-Change-Number: 29426 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022