osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/37172?usp=email )
Change subject: OBS: update_obs_project: add --exclude-package
......................................................................
OBS: update_obs_project: add --exclude-package
Prepare for building the asan repository. We don't need to build e.g.
the erlang projects for that.
Related: OS#5301
Change-Id: If02fd38da05113e28ee401d592edfc7528388308
---
M scripts/obs/update_obs_project.py
1 file changed, 28 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/72/37172/1
diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py
index ea9b731..6f3bffc 100755
--- a/scripts/obs/update_obs_project.py
+++ b/scripts/obs/update_obs_project.py
@@ -21,7 +21,7 @@
srcpkgs_updated = [] # list of pkgnames
-def parse_packages(packages_arg):
+def parse_packages(packages_arg, excludes_arg):
ret = []
if packages_arg:
for package in packages_arg:
@@ -29,11 +29,15 @@
ret += lib.config.projects_osmocom
else:
ret += [lib.set_proper_package_name(package)]
- return ret
+ else: # Default to all
+ ret += lib.config.projects_osmocom
+ ret += lib.config.projects_other
- # Default to all
- ret += lib.config.projects_osmocom
- ret += lib.config.projects_other
+ # Apply --exclude-package
+ for package in excludes_arg:
+ if package in ret:
+ ret.remove(package)
+
return ret
@@ -209,7 +213,11 @@
def main():
parser = argparse.ArgumentParser(
description="Generate source packages and upload them to OBS.")
- lib.add_shared_arguments(parser)
+ groups = lib.add_shared_arguments(parser)
+
+ groups["pkg"].add_argument("-E", "--exclude-package", nargs="*",
+ default=[],
+ help="do not build and update this package")
group_obs = parser.add_argument_group("OBS options")
group_obs.add_argument("-A", "--apiurl", help="OBS API URL or .oscrc alias"
@@ -230,7 +238,7 @@
args = parser.parse_args()
validate_args(args)
lib.set_args(args)
- packages = parse_packages(args.package)
+ packages = parse_packages(args.package, args.exclude_package)
if args.docker:
lib.docker.run_in_docker_and_exit("update_obs_project.py", True)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37172?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If02fd38da05113e28ee401d592edfc7528388308
Gerrit-Change-Number: 37172
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/+/37171?usp=email )
Change subject: OBS: improve argparse help output
......................................................................
OBS: improve argparse help output
Prepare to add more arguments, by first categorizing the existing
arguments into groups. Tweak the descriptions while at it.
Change-Id: I09a8caa885b72b9d806fbfb4c8d72fe9667feec5
---
M scripts/obs/build_srcpkg.py
M scripts/obs/lib/__init__.py
M scripts/obs/update_obs_project.py
3 files changed, 93 insertions(+), 64 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/37171/1
diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py
index a5feeea..86655f5 100755
--- a/scripts/obs/build_srcpkg.py
+++ b/scripts/obs/build_srcpkg.py
@@ -18,9 +18,9 @@
" code that runs to generate source packages which we"
" 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")
+ groups = lib.add_shared_arguments(parser)
+ groups["git"].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()
diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py
index a85f777..2cb8a40 100644
--- a/scripts/obs/lib/__init__.py
+++ b/scripts/obs/lib/__init__.py
@@ -19,60 +19,74 @@
def add_shared_arguments(parser):
""" Arguments shared between build_srcpkg.py and update_obs_project.py. """
- parser.add_argument("-f", "--feed",
- help="package feed (default: nightly). The feed"
- " determines the git revision to be built:"
- " 'nightly' and 'master' build 'origin/master',"
- " 'latest' builds the last signed tag,"
- " other feeds build their respective branch.",
- metavar="FEED", default="nightly",
- choices=lib.config.feeds)
- parser.add_argument("-a", "--allow-unknown-package", action="store_true",
- help="don't complain if the name of the package is not"
- " stored in lib/config.py")
- parser.add_argument("-b", "--git-branch", help="instead of using a branch"
- " based on the feed, checkout this git branch",
- metavar="BRANCH", default=None)
- parser.add_argument("-d", "--docker",
- help="run in docker to avoid installing required pkgs",
- action="store_true")
- parser.add_argument("-s", "--git-skip-fetch",
- help="do not fetch already cloned git repositories",
- action="store_false", dest="git_fetch")
- parser.add_argument("-S", "--git-skip-checkout",
- help="do not checkout and reset to a branch/tag",
- action="store_false", dest="git_checkout")
- 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"
- " for full list) depend on a meta-package such as"
- " osmocom-nightly, osmocom-latest, osmocom-2021q1"
- " etc. These meta-packages conflict with each"
- " other to ensure that one does not mix e.g."
- " latest and nightly packages by accident."
- " With this -c argument, it is possible to let"
- " these packages depend on a meta-package of a"
- " specific version. This is used for nightly and"
- " 20YYqX packages to ensure they are not mixed"
- " from different build dates (ABI compatibility"
- " is only on latest).")
- parser.add_argument("-p", "--conflict-pkgname", nargs="?",
- help="name of the meta-package to depend on (default:"
- " osmocom-$feed)")
- parser.add_argument("-M", "--no-meta", action="store_true",
- help="Don't depend on the meta package (helpful when"
- " building one-off packages for development)")
- parser.add_argument("-v", "--verbose", action="store_true",
+
+ group_reqprog = parser.add_argument_group("required program options")
+ group_reqprog.add_argument("-d", "--docker", help="run in docker to avoid"
+ " installing required pkgs",
+ action="store_true")
+ group_reqprog.add_argument("-i", "--ignore-req", action="store_true",
+ help="skip required programs check")
+
+ group_feed = parser.add_argument_group("feed options",
+ "The feed option implies the source revision (nightly/master: build"
+ " the master branch; latest: build the last tag) and when a package"
+ " is considered outdated (latest/master: when the commit changes on"
+ " the latest tag or on master; nightly: always).")
+ group_feed.add_argument("-f", "--feed", help="package feed (default:"
+ " nightly, can also be master or latest)",
+ metavar="FEED", default="nightly",
+ choices=lib.config.feeds)
+
+ group_pkg = parser.add_argument_group("package options")
+ group_pkg.add_argument("-a", "--allow-unknown-package",
+ action="store_true",
+ help="don't complain if the name of the package is"
+ " not stored in lib/config.py")
+ group_pkg.add_argument("-e", "--version-append",
+ help="add a string at the end of the version, e.g."
+ " '~osmocom' for the wireshark package")
+
+ group_git = parser.add_argument_group("git options")
+ group_git.add_argument("-b", "--git-branch", help="instead of using a"
+ " branch based on the feed, checkout this git"
+ " branch", metavar="BRANCH", default=None)
+ group_git.add_argument("-s", "--git-skip-fetch",
+ help="do not fetch already cloned git repositories",
+ action="store_false", dest="git_fetch")
+ group_git.add_argument("-S", "--git-skip-checkout",
+ help="do not checkout and reset to a branch/tag",
+ action="store_false", dest="git_checkout")
+
+ group_meta = parser.add_argument_group("meta package options",
+ "Osmocom packages depend on a meta-package such as osmocom-nightly."
+ " These meta-packages conflict with each other to ensure e.g."
+ " incompatible nightly and latest packages are not mixed by accident."
+ " For nightly we don't have API compatibility and so we let these"
+ " depend on a meta package of a specific build date (-c).")
+ group_meta.add_argument("-m", "--meta", action="store_true",
+ help="build a meta package (e.g. osmocom-nightly)")
+ group_meta.add_argument("-c", "--conflict-version", nargs="?",
+ help="depend on meta-package of specific version")
+ group_meta.add_argument("-p", "--conflict-pkgname", nargs="?",
+ help="name of the meta-package to depend on"
+ " (default: osmocom-$feed)")
+ group_meta.add_argument("-M", "--no-meta", action="store_true",
+ help="Don't depend on the meta package (use when"
+ " building one-off packages for development)")
+
+ group_devel = parser.add_argument_group("development options")
+ group_devel.add_argument("-v", "--verbose", action="store_true",
help="always print shell commands and their output,"
" instead of only printing them on error")
- parser.add_argument("-e", "--version-append",
- help="add a string at the end of the version, e.g."
- " '~osmocom' for the wireshark package to"
- " indicate that it is the version from our repo")
+
+ return {
+ "devel": group_devel,
+ "feed": group_feed,
+ "git": group_git,
+ "meta": group_meta,
+ "pkg": group_pkg,
+ "reqprog": group_reqprog,
+ }
def set_cmds_verbose(new_val):
diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py
index a456218..ea9b731 100755
--- a/scripts/obs/update_obs_project.py
+++ b/scripts/obs/update_obs_project.py
@@ -210,15 +210,18 @@
parser = argparse.ArgumentParser(
description="Generate source packages and upload them to OBS.")
lib.add_shared_arguments(parser)
- parser.add_argument("-A", "--apiurl", help="OBS API URL or .oscrc alias"
- " (e.g. https://obs.osmocom.org)")
- parser.add_argument("-n", "--no-skip-up-to-date",
- dest="skip_up_to_date", action="store_false",
- help="for latest feed, build and upload packages even"
- " if the version did not change")
- parser.add_argument("--delete", action="store_true",
- help="remove packages from OBS if the git branch (-b)"
- " does not exist anymore")
+
+ group_obs = parser.add_argument_group("OBS options")
+ group_obs.add_argument("-A", "--apiurl", help="OBS API URL or .oscrc alias"
+ " (e.g. https://obs.osmocom.org)")
+ group_obs.add_argument("-n", "--no-skip-up-to-date",
+ dest="skip_up_to_date", action="store_false",
+ help="for latest feed, build and upload packages"
+ " even if the version did not change")
+ group_obs.add_argument("--delete", action="store_true",
+ help="remove packages from OBS if the git branch"
+ " (-b) does not exist anymore")
+
parser.add_argument("obs_project",
help="OBS project, e.g. home:osmith:nightly")
parser.add_argument("package", nargs="*",
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37171?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I09a8caa885b72b9d806fbfb4c8d72fe9667feec5
Gerrit-Change-Number: 37171
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/+/37173?usp=email )
Change subject: OBS: add --configure-append
......................................................................
OBS: add --configure-append
Add a parameter for appending arguments to the ./configure line as it
gets called in the debian package. This will be used for asan packages.
Related: OS#5301
Change-Id: I5ae396cc190559eb9c6a1671db374a91f03924e7
---
M scripts/obs/lib/__init__.py
M scripts/obs/lib/debian.py
M scripts/obs/lib/srcpkg.py
3 files changed, 52 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/73/37173/1
diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py
index 2cb8a40..2e59806 100644
--- a/scripts/obs/lib/__init__.py
+++ b/scripts/obs/lib/__init__.py
@@ -45,6 +45,9 @@
group_pkg.add_argument("-e", "--version-append",
help="add a string at the end of the version, e.g."
" '~osmocom' for the wireshark package")
+ group_pkg.add_argument("-C", "--configure-append",
+ help="add these parameters to the ./configure line"
+ " (e.g. ' --enable-sanitize')")
group_git = parser.add_argument_group("git options")
group_git.add_argument("-b", "--git-branch", help="instead of using a"
diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py
index 6703f8b..dd85729 100644
--- a/scripts/obs/lib/debian.py
+++ b/scripts/obs/lib/debian.py
@@ -120,6 +120,39 @@
changelog_add_entry(project, version)
+def configure_append(project, parameters):
+ """ Add one or more configure parameters like --enable-sanitize to the
+ dh_auto_configure line, also add the override_dh_auto_configure block
+ if missing. """
+ print(f"{project}: adding configure parameters: {parameters}")
+ rules = f"{lib.git.get_repo_path(project)}/debian/rules"
+ override_found = False
+ replaced = False
+ with open(rules, "r") as f:
+ lines = f.readlines()
+ for i in range(len(lines)):
+ line = lines[i]
+ if line.startswith("override_dh_auto_configure:"):
+ override_found = True
+ continue
+ if "dh_auto_configure" not in line:
+ continue
+ assert override_found
+ if " -- " in line.replace("\t", " "):
+ lines[i] = line.replace(" --", f" -- {parameters}", 1)
+ else:
+ lines[i] = line.replace("dh_auto_configure",
+ f"dh_auto_configure -- {parameters}", 1)
+ replaced = True
+ break
+ if not override_found:
+ lines += ["\n",
+ "override_dh_auto_configure:\n",
+ f"\tdh_auto_configure -- {parameters}\n"]
+ with open(rules, "w") as f:
+ f.writelines(lines)
+
+
def build_source_package(project):
fix_source_format(project)
print(f"{project}: building debian source package")
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index aef7732..7701a83 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -204,6 +204,9 @@
if project in lib.config.projects_osmocom:
run_generate_build_dep(project)
+ if lib.args.configure_append:
+ lib.debian.configure_append(project, lib.args.configure_append)
+
lib.debian.build_source_package(project)
lib.debian.move_files_to_output(project)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37173?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I5ae396cc190559eb9c6a1671db374a91f03924e7
Gerrit-Change-Number: 37173
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/37169?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: saip-tool: Add 'extract-loadblock' to dump all applications from eSIM profile
......................................................................
saip-tool: Add 'extract-loadblock' to dump all applications from eSIM profile
This new action can be used to dump all java applications as raw 'load
block' (sometimes referred-to as ICJ file) from a profile.
Change-Id: I51cffa5ba3ddbea491341d678ec9249d7cf470a5
---
M contrib/saip-tool.py
M pySim/esim/saip/__init__.py
2 files changed, 40 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/69/37169/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37169?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I51cffa5ba3ddbea491341d678ec9249d7cf470a5
Gerrit-Change-Number: 37169
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
