Skip to content

Changes

Summary

  1. OBS: fix python 3.12 compat (details)
  2. OBS: improve argparse help output (details)
  3. OBS: update_obs_project: add --exclude-package (details)
  4. OBS: add --configure-append (details)
  5. OBS: add --disable-manuals (details)
  6. OBS: fix using --conflict-pkgname (details)
  7. jobs: add osmocom-obs-nightly-asan (details)
  8. jobs/ttcn3-testsuites: add -asan (details)
  9. OBS: get_git_version: debian/changelog as fallback (details)
Commit b8c6a5024658f0a1ad628b1ab319a483d7c55ef5 by Oliver Smith
OBS: fix python 3.12 compat

Fix for:

  File "/home/user/code/osmo-dev/src/osmo-ci/scripts/obs/lib/__init__.py", line 112, in check_required_programs
    if not importlib.find_loader(module):
           ^^^^^^^^^^^^^^^^^^^^^
AttributeError: module 'importlib' has no attribute 'find_loader

Change-Id: I6430c2c4f75c8408d00305e1a1f0a64600eb086c
The file was modified scripts/obs/lib/__init__.py
Commit 566b0a50d26bfcff45c541bb548766d4426f2164 by Oliver Smith
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
The file was modified scripts/obs/build_srcpkg.py
The file was modified scripts/obs/lib/__init__.py
The file was modified scripts/obs/update_obs_project.py
Commit 1b1d19d197eaec1db3f52732bdd0e6270630b8cd by Oliver Smith
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
The file was modified scripts/obs/update_obs_project.py
Commit 34c176b2c3acf0506148820340f9e44d1ec0e6cf by Oliver Smith
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
The file was modified scripts/obs/lib/__init__.py
The file was modified scripts/obs/lib/debian.py
The file was modified scripts/obs/lib/srcpkg.py
Commit 2b2dda2ac62c9a500689a8077bbeca15b4607cab by Oliver Smith
OBS: add --disable-manuals

Allow building binary packages faster by disabling the manuals. We don't
need those for the asan repository.

Related: OS#5301
Change-Id: I3ff84f26ee6aa53cbcbe2275bedc6b724a461adc
The file was modified scripts/obs/lib/__init__.py
The file was modified scripts/obs/lib/srcpkg.py
The file was modified scripts/obs/lib/debian.py
Commit a0daea25b05a787657df81921b1eddb9b3ceede1 by Oliver Smith
OBS: fix using --conflict-pkgname

Use --conflict-pkgname as package name, instead of hardcoding
osmocom-$FEED.

Fix for:
  FileNotFoundError: [Errno 2] No such file or directory: '/obs/_cache/osmocom-nightly-asan'

Change-Id: I4ddb2e9adc25e7e8e8c9d17236b76d9f2e9c2a9c
The file was modified scripts/obs/update_obs_project.py
The file was modified scripts/obs/lib/metapkg.py
Commit 67a5fc886a176ae9485400e3e957ab728a9007d3 by Oliver Smith
jobs: add osmocom-obs-nightly-asan

Add a new job that builds source packages for osmocom:nightly:asan, and
uploads them there.

It was considered whether we should instead of building a binary
repository with asan packages in OBS, just build all packages and
libraries from source at the jenkins builders. We decided against it,
see the related discussion.

Related: https://gerrit.osmocom.org/c/docker-playground/+/28902/1#message-30650d8450d2d129b6ef3f447f65e4b866d2f801
Related: OS#5301
Change-Id: I8fb6664702f85ee057377cb374394c8f24202474
The file was addedjobs/osmocom-obs-nightly-asan.yml
The file was modified scripts/obs/lib/config.py
Commit d67f47e82e6b16757b3435d4ccded28a90a140a5 by Oliver Smith
jobs/ttcn3-testsuites: add -asan

Related: OS#5301
Change-Id: I08964335efd9276a147d58bf960ffdf535e3b51c
The file was modified jobs/ttcn3-testsuites.yml
Commit 3b20d2a281430c44e2f2bb95109708aa85eeff99 by Oliver Smith
OBS: get_git_version: debian/changelog as fallback

Fix osmocom-bb getting 0.1.0 as version:

  osmocom-bb: has no git tags, using 0.0.0 as version
  osmocom-bb: building source package 0.0.0.3621-d70e
  osmocom-bb: WARNING: version from changelog (0.1.0) is higher than version based on git tag (0.0.0.3621-d70e), using version from changelog (git tag not pushed yet?)

With this patch:

  osmocom-bb: has no git tags
  osmocom-bb: getting version from debian/changelog
  osmocom-bb: building source package 0.1.0.3621-d70e
  osmocom-bb: adding debian/changelog entry (0.1.0 => 0.1.0.3621-d70e)

Change-Id: I3a284b50ca62a2faff16702b7108ca391229caf1
The file was modified scripts/obs/lib/srcpkg.py