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

Change in docker-playground[master]: debian-bullseye-obs-asan: new container

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28902 ) Change subject: debian-bullseye-obs-asan: new container ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I'd probably change the osmo-*-master Dockerfiles to build all dependency libs from master with --enable-asan enabled, I have been doing that for ages in my local copy of docker-playground.git This has the benefit that during development one can for instance, easily set LIBOSMO_NETIF_BRANCH=myownbranch when testing ie. osmo-stp-master. In the end it's called -master and not -nightly :) In any case, if others are happy with this then I'm fine too. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic7d6e7cc401acadbae9156d3e7f3a6230c2fb198 Gerrit-Change-Number: 28902 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 14:02:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3: add debian nightly + asan jobs

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28909 ) Change subject: jobs/ttcn3: add debian nightly + asan jobs ...................................................................... jobs/ttcn3: add debian nightly + asan jobs Related: OS#5301 Depends: docker-playground Ic7d6e7cc401acadbae9156d3e7f3a6230c2fb198 Change-Id: I7a0b3f57607ac1e25d98d2fe3d611476c71d7cf7 --- M jobs/ttcn3-testsuites.yml 1 file changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/09/28909/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 19a43ca..f360d9d 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -160,6 +160,81 @@ description: | Test open5gs-smfd + open5gs-upfd PGW main. + # debian nightly + asan (OS#5301) + - ttcn3-msc-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" + timer: 40 14 * * * + - ttcn3-pcu-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" + timer: 00 15 * * * + - ttcn3-pcu-test-sns-asan: + blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" + timer: 15 15 * * * + - ttcn3-sgsn-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-sgsn-test.*" + timer: 30 15 * * * + - ttcn3-bsc-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" + timer: 00 16 * * * + - ttcn3-mgw-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" + timer: 30 16 * * * + - ttcn3-hlr-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-hlr-test.*" + timer: 45 16 * * * + - ttcn3-bts-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" + timer: 00 17 * * * + - ttcn3-sip-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-sip-test.*" + timer: 30 17 * * * + - ttcn3-bscnat-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-bscnat-test.*" + timer: 00 18 * * * + disabled: true + - ttcn3-bsc-test-sccplite-asan: + blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" + timer: 30 18 * * * + - ttcn3-remsim-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-remsim-test.*" + timer: 00 19 * * * + - ttcn3-stp-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-stp-test.*" + timer: 30 19 * * * + - ttcn3-sccp-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-sccp-test.*" + timer: 00 20 * * * + - ttcn3-smlc-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" + timer: 10 20 * * * + - ttcn3-gbproxy-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" + timer: 20 20 * * * + - ttcn3-cbc-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" + timer: 40 20 * * * + - ttcn3-ns-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-ns-test.*" + timer: 00 21 * * * + - ttcn3-ns-test-sns-asan: + blocking: "^(ttcn3|TTCN3-.*)-ns-test-sns.*" + timer: 10 21 * * * + - ttcn3-ns-test-sgsn-sns-asan: + blocking: "^(ttcn3|TTCN3-.*)-ns-test-sgsn-sns.*" + timer: 30 21 * * * + - ttcn3-pcap-client-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-pcap-client-test.*" + timer: 40 21 * * * + - ttcn3-bsc-test-vamos-asan: + blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" + timer: 00 22 * * * + - ttcn3-hnodeb-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-hnodeb-test.*" + timer: 40 22 * * * + - ttcn3-hnbgw-test-asan: + blocking: "^(ttcn3|TTCN3-.*)-hnbgw-test.*" + timer: 40 23 * * * + # debian latest stable - nplab-m3ua-test-latest: blocking: "^(nplab|NPLAB-.*)-m3ua-test.*" @@ -459,6 +534,11 @@ DIR="$(echo "{job-name}" | sed s/\-latest$//)" export IMAGE_SUFFIX="latest" ;; + *-asan) + DIR="$(echo "{job-name}" | sed s/\-asan$//)" + export OSMOCOM_REPO_VERSION="asan" + export IMAGE_SUFFIX="asan" + ;; *) DIR="{job-name}" export IMAGE_SUFFIX="master" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7a0b3f57607ac1e25d98d2fe3d611476c71d7cf7 Gerrit-Change-Number: 28909 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmocom-obs-nightly-asan.yml: new file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28906 ) Change subject: jobs/osmocom-obs-nightly-asan.yml: new file ...................................................................... jobs/osmocom-obs-nightly-asan.yml: new file Add a new job for generating and pushing osmocom:nightly:asan packages. I've not added it to the existing osmocom-obs.yml, as this would push it to both obs.osmocom.org and build.opensuse.org. Related: OS#5301 Change-Id: I1c8c65bd1829baa29864ad186f3c43e79979d141 --- A jobs/osmocom-obs-nightly-asan.yml 1 file changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/06/28906/1 diff --git a/jobs/osmocom-obs-nightly-asan.yml b/jobs/osmocom-obs-nightly-asan.yml new file mode 100644 index 0000000..35c7d9b --- /dev/null +++ b/jobs/osmocom-obs-nightly-asan.yml @@ -0,0 +1,47 @@ +--- +- project: + name: Osmocom_OBS + jobs: + - Osmocom_OBS_nightly_asan + +- job: + name: 'Osmocom_OBS_nightly_asan' + project-type: freestyle + defaults: global + description: | + See <a href="https://osmocom.org/issues/5301">OS#5301</a> for more + information. + node: obs + parameters: + - string: + name: BRANCH + description: osmo-ci.git branch + default: 'refs/remotes/origin/master' + builders: + - shell: | + export PYTHONUNBUFFERED=1 + + ./scripts/obs/update_obs_project.py \ + --apiurl obs.osmocom.org \ + --conflict-version "$(date +%Y%m%d%H%M)" \ + --docker \ + --feed nightly-asan \ + --git-fetch \ + --meta \ + osmocom:nightly:asan + scm: + - git: + branches: + - '$BRANCH' + url: git://git.osmocom.org/osmo-ci + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins(a)osmocom.org' + triggers: + - timed: "H 01 * * *" + + publishers: + - email: + notify-every-unstable-build: true + recipients: 'jenkins-notifications(a)lists.osmocom.org' + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1c8c65bd1829baa29864ad186f3c43e79979d141 Gerrit-Change-Number: 28906 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3: disable osmo-hnodeb-latest

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28907 ) Change subject: jobs/ttcn3: disable osmo-hnodeb-latest ...................................................................... jobs/ttcn3: disable osmo-hnodeb-latest Disable it as there's no osmo-hnodeb-latest in docker-playground.git yet. Change-Id: I0ccc134952b20f5d2601ebdcdb496c81b36987cd --- M jobs/ttcn3-testsuites.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/07/28907/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 131ffac..c05fa5f 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -232,6 +232,7 @@ - ttcn3-hnodeb-test-latest: blocking: "^(ttcn3|TTCN3-.*)-hnodeb-test.*" timer: 40 12 * * * + disabled: true - ttcn3-upf-test-latest: blocking: "^(ttcn3|TTCN3-.*)-upf-test.*" timer: 00 13 * * * -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0ccc134952b20f5d2601ebdcdb496c81b36987cd Gerrit-Change-Number: 28907 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: Cosmetic: jobs/ttcn3: debian-stretch -> debian

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28908 ) Change subject: Cosmetic: jobs/ttcn3: debian-stretch -> debian ...................................................................... Cosmetic: jobs/ttcn3: debian-stretch -> debian Remove reference to stretch (debian 9), as the jobs run on a newer debian version now. Remove the reference altogether so we don't need to update it here. The current version can be looked up in docker-playground.git. Change-Id: I06c74830b0f6fe0baed44c300f9e1023fb0522de --- M jobs/ttcn3-testsuites.yml 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/08/28908/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index c05fa5f..19a43ca 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -20,7 +20,7 @@ - "{job-name}" # Folders from docker-playground.git job-name: - # debian-stretch nightly - order by time + # debian nightly - order by time - nplab-m3ua-test: blocking: "^(nplab|NPLAB-.*)-m3ua-test.*" timer: 10 03 * * * @@ -160,7 +160,7 @@ description: | Test open5gs-smfd + open5gs-upfd PGW main. - # debian-stretch latest stable + # debian latest stable - nplab-m3ua-test-latest: blocking: "^(nplab|NPLAB-.*)-m3ua-test.*" timer: 10 03 * * * @@ -241,7 +241,7 @@ blocking: "^(ttcn3|TTCN3-.*)-hnbgw-test.*" timer: 40 13 * * * - # Jobs below use uppercase TTCN3-$DISTRO, so they get listed separately from the ttcn3-* (debian-stretch) jobs + # Jobs below use uppercase TTCN3-$DISTRO, so they get listed separately from the ttcn3-* (debian) jobs # centos7 nightly - TTCN3-centos7-pcap-client-test: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I06c74830b0f6fe0baed44c300f9e1023fb0522de Gerrit-Change-Number: 28908 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: obs: fix_source_format: ignore missing \n

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28904 ) Change subject: obs: fix_source_format: ignore missing \n ...................................................................... obs: fix_source_format: ignore missing \n Apparently a \n at the end of debian/source/format is not required, so don't fix it if it is missing. This avoids printing this confusing line: osmo-trx: fixing debian/source/format (3.0 (native) => 3.0 (native)) Change-Id: I7f9bb22a389a2109109f7fecd3b7ae0413fe6f5b --- M scripts/obs/lib/debian.py 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/04/28904/1 diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index af152da..89153fb 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -59,15 +59,14 @@ if not os.path.exists(format_path): return - expected = "3.0 (native)\n" - current = open(format_path, "r").read() + expected = "3.0 (native)" + current = open(format_path, "r").read().rstrip() if current == expected: return - print(f"{project}: fixing debian/source/format ({current.rstrip()} =>" - f" {expected.rstrip()})") - open(format_path, "w").write(expected) + print(f"{project}: fixing debian/source/format ({current} => {expected})") + open(format_path, "w").write(f"{expected}\n") def get_last_version_from_changelog(project): -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7f9bb22a389a2109109f7fecd3b7ae0413fe6f5b Gerrit-Change-Number: 28904 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: obs: build nightly-asan with --enable-sanitize

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28905 ) Change subject: obs: build nightly-asan with --enable-sanitize ...................................................................... obs: build nightly-asan with --enable-sanitize Related: OS#5301 Change-Id: Ife826b2c8e1173a2faf292e76815be6f0bd0a62c --- M scripts/obs/build_srcpkg.py M scripts/obs/lib/__init__.py M scripts/obs/lib/config.py M scripts/obs/lib/debian.py M scripts/obs/lib/metapkg.py M scripts/obs/lib/srcpkg.py M scripts/obs/update_obs_project.py 7 files changed, 156 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/05/28905/1 diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py index ccf82d7..0e259b5 100755 --- a/scripts/obs/build_srcpkg.py +++ b/scripts/obs/build_srcpkg.py @@ -33,7 +33,7 @@ lib.check_required_programs() if args.package: - lib.check_package(args.package) + lib.check_packages(args.feed, [args.package]) lib.remove_temp() if args.meta: diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 193c248..bb990df 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -66,15 +66,28 @@ exit(1) -def check_package(package): - if package in lib.config.projects_osmocom: - return - if package in lib.config.projects_other: - return +def get_packages_for_feed(feed): + ret = [] - print(f"ERROR: unknown package: {package}") - print("See packages_osmocom and packages_other in obs/lib/config.py") - exit(1) + if feed == "nightly-asan": + for project in lib.config.projects_osmocom: + if project not in lib.config.projects_osmocom_exclude_asan: + ret += [project] + return ret + + ret += lib.config.projects_osmocom + ret += lib.config.projects_other + return ret + + +def check_packages(feed, packages): + packages_feed = get_packages_for_feed(feed) + + for package in packages: + if package not in packages_feed: + print(f"ERROR: unknown package: {package}") + print("See packages_osmocom and packages_other in obs/lib/config.py") + exit(1) def exit_error_cmd(completed, error_msg): diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 22c9c05..efaecd4 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -32,6 +32,10 @@ "2022q2", "latest", "nightly", + "nightly-asan", # OS#5301 +] +feeds_no_rpm_spec = [ + "nightly-asan", ] # Osmocom projects: generated source packages will depend on a meta package, @@ -80,6 +84,15 @@ "open5gs", ] +# Do not build these for osmocom:nightly:asan +projects_osmocom_exclude_asan = [ + "erlang/osmo_dia2gsup", + "libosmo-dsp", + "osmo-gsm-manuals", + "python/osmo-python-tests", + "rtl-sdr", +] + git_url_default = "https://gerrit.osmocom.org" # /project gets appended git_url_other = { "libosmo-dsp": "https://gitea.osmocom.org/sdr/libosmo-dsp", diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 89153fb..9109b29 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -87,6 +87,10 @@ """ Adjust the changelog if the version in the changelog is different from the given version. """ version_changelog = get_last_version_from_changelog(project) + + if feed.endswith("-asan"): + version = f"{version}~asan0" + if version_changelog == version: return @@ -95,6 +99,100 @@ changelog_add_entry(project, feed, version) +def add_configure_arg(project, arg): + """ Add a configure option like --enable-sanitize to the dh_auto_configure + line, also add the override_dh_auto_configure block if missing. """ + print(f"{project}: adding {arg} to debian/rules") + 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 + assert " -- " in line.replace("\t", " ") + + lines[i] = line.replace(" --", f" -- {arg}", 1) + replaced = True + break + + if not override_found: + lines += ["\n", + "override_dh_auto_configure:\n", + f"\tdh_auto_configure -- {arg}\n"] + + with open(rules, "w") as f: + f.writelines(lines) + + +def disable_tests(project): + """ Add or replace an existing override_dh_auto_test block with one that + disables the tests. As of writing we need this for osmocom:nightly:asan + because OBS has ulimit -v hardcoded (OS#5301). """ + print(f"{project}: disabling tests in debian/rules") + 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_test:"): + override_found = True + continue + + if not override_found: + continue + + # End of override_dh_auto_test block + if line != "\n": + lines[i] = "\n" + continue + + replaced = True + break + + if not override_found: + lines += ["\n", + "override_dh_auto_test:\n"] + + with open(rules, "w") as f: + f.writelines(lines) + + +def disable_manuals(project): + """ For osmocom:nightly:asan we need to disable manuals, as the binaries + built with sanitizer flags can't run in OBS and they would be running + during generation of VTY references (OS#5301). """ + print(f"{project}: disabling manuals") + debian = f"{lib.git.get_repo_path(project)}/debian" + + # Remove osmo-gsm-manuals dep + lib.run_cmd(["sed", "-i", "/osmo-gsm-manuals-dev/d", f"{debian}/control"]) + + # Remove debian/*-doc.install + lib.run_cmd(f"rm -rf {shlex.quote(debian)}/*-doc.install", shell=True) + + # debian/rules: remove --enable-manuals/doxygen, add --disable-doxygen + lib.run_cmd(["sed", "-i", "s/--enable-manuals//g", f"{debian}/rules"]) + lib.run_cmd(["sed", "-i", "s/--enable-doxygen//g", f"{debian}/rules"]) + add_configure_arg(project, "--disable-doxygen") + + def build_source_package(project): fix_source_format(project) print(f"{project}: building debian source package") diff --git a/scripts/obs/lib/metapkg.py b/scripts/obs/lib/metapkg.py index dd261de..fcb1f91 100644 --- a/scripts/obs/lib/metapkg.py +++ b/scripts/obs/lib/metapkg.py @@ -97,8 +97,9 @@ lib.debian.build_source_package(pkgname) lib.debian.move_files_to_output(pkgname) - generate_rpm_spec(feed, version) - lib.rpm_spec.copy_to_output(pkgname) + if feed not in lib.config.feeds_no_rpm_spec: + generate_rpm_spec(feed, version) + lib.rpm_spec.copy_to_output(pkgname) lib.remove_cache_extra_files() return version diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 468a240..55831be 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -11,7 +11,7 @@ """ checkout a commit, either latest tag or master or 20YY branch """ if feed == "latest": lib.git.checkout_latest_tag(project) - elif feed == "nightly": + elif feed == "nightly" or feed.startswith("nightly-"): lib.git.checkout_default_branch(project) else: # 2022q1 etc lib.git.checkout(project, feed) @@ -118,6 +118,13 @@ f.write(f"{version}\n") +def check_has_rpm_spec(project, feed): + if feed in lib.config.feeds_no_rpm_spec: + return False + + return lib.rpm_spec.get_spec_in_path(project) is not None + + def build(project, feed, conflict_version, fetch): lib.git.clone(project, fetch) lib.git.clean(project) @@ -125,7 +132,7 @@ version = get_version_for_feed(project, feed, conflict_version) epoch = get_epoch(project) version_epoch = f"{epoch}:{version}" if epoch else version - has_rpm_spec = lib.rpm_spec.get_spec_in_path(project) is not None + has_rpm_spec = check_has_rpm_spec(project, feed) print(f"{project}: building source package {version_epoch}") write_tarball_version(project, version_epoch) @@ -146,6 +153,11 @@ print(f"{project}: running {project_specific_func}") globals()[project_specific_func]() + if feed.endswith("-asan"): + lib.debian.add_configure_arg(project, "--enable-sanitize") + lib.debian.disable_tests(project) + lib.debian.disable_manuals(project) + lib.debian.build_source_package(project) lib.debian.move_files_to_output(project) diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 759acfe..4f84edf 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -19,17 +19,12 @@ srcpkgs_updated = [] # list of pkgnames -def parse_packages(packages_arg): - if packages_arg: - for package in packages_arg: - lib.check_package(package) - return packages_arg +def parse_packages(feed, packages): + if packages: + lib.check_packages(feed, packages) + return packages - # Default to all - ret = [] - ret += lib.config.projects_osmocom - ret += lib.config.projects_other - return ret + return lib.get_packages_for_feed(feed) def build_srcpkg(feed, package, conflict_version, fetch, is_meta_pkg): @@ -191,7 +186,7 @@ args = parser.parse_args() proj = args.obs_project feed = args.feed - packages = parse_packages(args.package) + packages = parse_packages(feed, args.package) lib.set_cmds_verbose(args.verbose) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ife826b2c8e1173a2faf292e76815be6f0bd0a62c Gerrit-Change-Number: 28905 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-obs-asan: new container

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28902 ) Change subject: debian-bullseye-obs-asan: new container ...................................................................... debian-bullseye-obs-asan: new container Add docker container and adjust jenkins-common.sh scripts for running the testsuite against the asan repository. Related: OS#5301 Change-Id: Ic7d6e7cc401acadbae9156d3e7f3a6230c2fb198 --- A debian-bullseye-obs-asan/Dockerfile A debian-bullseye-obs-asan/Makefile M jenkins-common.sh 3 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/02/28902/1 diff --git a/debian-bullseye-obs-asan/Dockerfile b/debian-bullseye-obs-asan/Dockerfile new file mode 100644 index 0000000..b266934 --- /dev/null +++ b/debian-bullseye-obs-asan/Dockerfile @@ -0,0 +1,27 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bullseye +FROM ${REGISTRY}/${UPSTREAM_DISTRO} +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" +ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly:/asan/Debian_11/" + +RUN apt-get update && \ + apt-get upgrade -y && \ + apt-get install -y --no-install-recommends \ + telnet \ + ca-certificates \ + gnupg \ + && \ + apt-get clean + +COPY .common/Release.key /tmp/Release.key +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-asan.list + +# Make respawn.sh part of this image, so it can be used by other images based on it +COPY .common/respawn.sh /usr/local/bin/respawn.sh + +# Invalidate cache once the repository is updated +ADD $OSMOCOM_REPO/Release /tmp/Release diff --git a/debian-bullseye-obs-asan/Makefile b/debian-bullseye-obs-asan/Makefile new file mode 100644 index 0000000..736769d --- /dev/null +++ b/debian-bullseye-obs-asan/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:bullseye +DISTRO=debian-bullseye +include ../make/Makefile diff --git a/jenkins-common.sh b/jenkins-common.sh index b393b05..830c65c 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -20,6 +20,7 @@ osmo-*-centos7) echo "centos7-build" ;; osmo-*-centos8) echo "centos8-build" ;; osmo-*-latest) echo "debian-bullseye-obs-latest" ;; + osmo-*-asan) echo "debian-bullseye-obs-asan" ;; osmo-*) echo "debian-bullseye-build" ;; open5gs-*) echo "debian-bullseye-build" ;; ttcn3-*) echo "debian-bullseye-titan" ;; @@ -70,6 +71,12 @@ # e.g. centos8-obs-2021q1 -> centos8-obs-latest echo "$1" | sed 's/20[0-9][0-9]q.*$/latest/' ;; + osmo-*-asan) + # e.g. osmo-mgw-asan -> osmo-mgw-latest + # Using latest and not master, so the binary packages from + # the asan repository are not only used for libraries. + echo "$1" | sed 's/-asan/-latest/' + ;; *) echo "$1" ;; -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic7d6e7cc401acadbae9156d3e7f3a6230c2fb198 Gerrit-Change-Number: 28902 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in docker-playground[master]: fix_perms: use debian:bullseye

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28903 ) Change subject: fix_perms: use debian:bullseye ...................................................................... fix_perms: use debian:bullseye Use debian:bullseye instead of debian-bullseye-build. Building the latter requires a lot of time, it's definitively not needed for just running chmod. Use debian:bullseye, since we use it as base for most images and it's therefore very likely that it's already downloaded (and if not, it would get downloaded here). Change-Id: I88f513a0a8ee04628842a7aa1b663c390d2032cd --- M jenkins-common.sh 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/03/28903/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 830c65c..f12bdf0 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -245,16 +245,12 @@ } fix_perms() { - if ! docker_image_exists "debian-bullseye-build"; then - docker_images_require "debian-bullseye-build" - fi - echo Fixing permissions docker run --rm \ -v $VOL_BASE_DIR:/data \ -v $CACHE_DIR:/cache \ --name ${BUILD_TAG}-cleaner \ - $REPO_USER/debian-bullseye-build \ + debian:bullseye \ chmod -R a+rX /data/ /cache/ } -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I88f513a0a8ee04628842a7aa1b663c390d2032cd Gerrit-Change-Number: 28903 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: bts_trx_vty: do not print nmstate of bb_trxc mo

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28895 ) Change subject: bts_trx_vty: do not print nmstate of bb_trxc mo ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/bts_trx_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/28895/comment/d19547a0_8b3e51b1 PS1, Line 743: if (!is_ericsson_bts(trx->bts)) { > Well taking into account that some osmo-cb generic parts expect the BBTRANSC MO to be in a certain s […] osmo-bsc* -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0f5501f6fbc7ce6d5457676b16c7f93f70db5763 Gerrit-Change-Number: 28895 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 10:53:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022