October 2026 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ci[master]: publish-manuals-for-tags: mount all scripts
by fixeria 06 Oct '26

06 Oct '26

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/43787?usp=email ) Change subject: publish-manuals-for-tags: mount all scripts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I151ab8698ffb04762329e3a624a94cc9ec9eed82 Gerrit-Change-Number: 43787 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Oct 2026 11:52:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ci[master]: publish-manuals-for-tags: build full osmo-trx
by pespin 06 Oct '26

06 Oct '26

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/43788?usp=email ) Change subject: publish-manuals-for-tags: build full osmo-trx ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4f0ef6f366eba44c63b158442b6417729ef426d1 Gerrit-Change-Number: 43788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Oct 2026 11:50:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: publish-manuals-for-tags: mount all scripts
by pespin 06 Oct '26

06 Oct '26

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/43787?usp=email ) Change subject: publish-manuals-for-tags: mount all scripts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I151ab8698ffb04762329e3a624a94cc9ec9eed82 Gerrit-Change-Number: 43787 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Oct 2026 11:50:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ci[master]: publish-manuals-for-tags: build full osmo-bts
by pespin 06 Oct '26

06 Oct '26

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/43789?usp=email ) Change subject: publish-manuals-for-tags: build full osmo-bts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I092212f3b0dc14ebd1463d45dca66118f92dec53 Gerrit-Change-Number: 43789 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Oct 2026 11:49:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ci[master]: publish-manuals-for-tags: build full osmo-trx
by osmith 06 Oct '26

06 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/43788?usp=email ) Change subject: publish-manuals-for-tags: build full osmo-trx ...................................................................... publish-manuals-for-tags: build full osmo-trx Build osmo-trx with all --with options, so we get the related VTY reference documentation pdfs. Related: OS#7094 Change-Id: I4f0ef6f366eba44c63b158442b6417729ef426d1 --- M scripts/manuals/publish-manuals-for-tags.sh 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/88/43788/1 diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index e68fdd5..bc602f8 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -264,6 +264,14 @@ osmo-msc|osmo-sgsn) echo "--enable-iu" ;; + osmo-trx) + echo "--with-bladerf" + echo "--with-ipc" + echo "--with-lms" + echo "--with-mstrx" + echo "--with-uhd" + echo "--with-usrp1" + ;; esac } @@ -379,7 +387,7 @@ build_publish_manuals() { local repo="$1" local tag="$2" - local configure_opts="--enable-manuals $(get_configure_opts_from_repo_name "$repo")" + local configure_opts="--enable-manuals $(get_configure_opts_from_repo_name "$repo" | tr '\n' ' ')" echo "$LOG_PREFIX Building manuals" if ! docker run \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4f0ef6f366eba44c63b158442b6417729ef426d1 Gerrit-Change-Number: 43788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ci[master]: publish-manuals-for-tags: build full osmo-bts
by osmith 06 Oct '26

06 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/43789?usp=email ) Change subject: publish-manuals-for-tags: build full osmo-bts ...................................................................... publish-manuals-for-tags: build full osmo-bts Build osmo-bts with all --with options, so we get the related VTY reference documentation pdfs. Related: OS#7094 Change-Id: I092212f3b0dc14ebd1463d45dca66118f92dec53 --- A scripts/manuals/osmo-bts-get-all-headers.sh M scripts/manuals/publish-manuals-for-tags.sh 2 files changed, 57 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/89/43789/1 diff --git a/scripts/manuals/osmo-bts-get-all-headers.sh b/scripts/manuals/osmo-bts-get-all-headers.sh new file mode 100644 index 0000000..bdfc068 --- /dev/null +++ b/scripts/manuals/osmo-bts-get-all-headers.sh @@ -0,0 +1,32 @@ +#!/bin/sh -ex +SCRIPTS_DIR="$(realpath "$(dirname "$0")/..")" + +BTS_MODELS=" + sysmo + oct + lc15 + oc2g +" + +for i in $BTS_MODELS; do + DIR=/tmp/osmo-layer1-headers/"$i" + + if [ -f "$DIR/.done" ]; then + continue + fi + + mkdir -p "$DIR" + cd "$DIR" + "$SCRIPTS_DIR"/osmo-layer1-headers.sh "$i" + touch "$DIR"/.done +done + +# Create the directory structure expected for the sysmocom/femtobts headers: +# https://gitea.osmocom.org/cellular-infrastructure/osmo-bts/src/branch/maste… +cd /tmp/osmo-layer1-headers/sysmo/ +if ! [ -e .done-inst ]; then + mkdir -p inst/include/sysmocom/femtobts + ln -s /tmp/osmo-layer1-headers/sysmo/layer1-headers/include/* \ + inst/include/sysmocom/femtobts/ + touch .done-inst +fi diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index bc602f8..d375989 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -2,6 +2,7 @@ . "$(dirname "$0")/../common.sh" OSMO_CI_DIR="$(realpath $(dirname "$0")/../..)" TEMP="$OSMO_CI_DIR/_temp_manuals" +L1_DIR="/tmp/osmo-layer1-headers" WEB_PATH="/downloads/home/docs/web-files" SSH_COMMAND="ssh -o UserKnownHostsFile=$TEMP/src/osmo-gsm-manuals/build/known_hosts -p 48" DOCKER_IMAGE="$USER/debian-trixie-build" @@ -245,6 +246,7 @@ mkdir -p \ "$TEMP" \ + "$TEMP/osmo-layer1-headers" \ "$TEMP/src" check_ssh_auth_sock() { @@ -258,6 +260,21 @@ # $1: repo name get_configure_opts_from_repo_name() { case "$1" in + osmo-bts) + # contrib/jenkins_sysmobts.sh + echo "--enable-sysmocom-bts" + echo "--with-sysmobts=$L1_DIR/sysmo/inst/include" + # contrib/jenkins_oct_and_bts_trx.sh + echo "--enable-octphy" + echo "--enable-trx" + echo "--with-octsdr-2g=$L1_DIR/oct/layer1-headers/" + # contrib/jenkins_lc15.sh + echo "--enable-litecell15" + echo "--with-litecell15=$L1_DIR/lc15/layer1-headers/inc/" + # contrib/jenkins_oc2g.sh + echo "--enable-oc2g" + echo "--with-oc2g=$L1_DIR/oc2g/layer1-headers/inc/" + ;; osmo-hnbgw) echo "--enable-pfcp" ;; @@ -400,6 +417,7 @@ -e "SSH_AUTH_SOCK=/ssh-agent" \ -v "$OSMO_CI_DIR/scripts:/osmo-ci-scripts" \ -v "$TEMP/src/$repo/:/build" \ + -v "$TEMP/osmo-layer1-headers/:$L1_DIR" \ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ "$DOCKER_IMAGE" \ sh -ex -c " @@ -424,6 +442,13 @@ cd /opt/osmo-gsm-manuals/ patch -p1 < /osmo-ci-scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch + # Other preparations + case $repo in + osmo-bts) + su build -c \"sh -ex /osmo-ci-scripts/manuals/osmo-bts-get-all-headers.sh\" + ;; + esac + # Build manuals cd /build case $repo in -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I092212f3b0dc14ebd1463d45dca66118f92dec53 Gerrit-Change-Number: 43789 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: publish-manuals-for-tags: mount all scripts
by osmith 06 Oct '26

06 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/43787?usp=email ) Change subject: publish-manuals-for-tags: mount all scripts ...................................................................... publish-manuals-for-tags: mount all scripts Make the whole scripts dir available instead of only scripts/manuals. This is needed so we can access scripts/osmo-layer1-headers.sh for building osmo-bts with more options in order to get the VTY reference manuals. Related: OS#7094 Change-Id: I151ab8698ffb04762329e3a624a94cc9ec9eed82 --- M scripts/manuals/publish-manuals-for-tags.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/87/43787/1 diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index 2f0c266..e68fdd5 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -390,7 +390,7 @@ -e "OSMO_REPOSITORY=$(get_docs_dir_from_repo_name "$repo")" \ -e "PUBLISH_REF=$tag" \ -e "SSH_AUTH_SOCK=/ssh-agent" \ - -v "$OSMO_CI_DIR/scripts/manuals:/manuals" \ + -v "$OSMO_CI_DIR/scripts:/osmo-ci-scripts" \ -v "$TEMP/src/$repo/:/build" \ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ "$DOCKER_IMAGE" \ @@ -414,7 +414,7 @@ # Remove DRAFT in osmo-gsm-manuals cd /opt/osmo-gsm-manuals/ - patch -p1 < /manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch + patch -p1 < /osmo-ci-scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch # Build manuals cd /build -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I151ab8698ffb04762329e3a624a94cc9ec9eed82 Gerrit-Change-Number: 43787 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: podman: always mount osmo-dev dir
by osmith 06 Oct '26

06 Oct '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43771?usp=email ) Change subject: testenv: podman: always mount osmo-dev dir ...................................................................... testenv: podman: always mount osmo-dev dir Prepare to be able to use osmo-dev for building some test components from source even if running with --binary-packages. This is needed for e.g. the bts testsuite, where we should always use master for both trxcon and osmo-trx-proxy, regardless of the osmo-bts version (nightly/latest/asan). These are part of the testsuite and not SUT. Related: OS#6638#note-12 Change-Id: Ie470be84dd7b9f34dfe8ed461710c1964b481984 --- M _testenv/testenv/podman.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index 0293712..24ef731 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -264,7 +264,8 @@ "-e", "TESTENV_BINARY_REPO=1", ] - else: + + if os.path.exists(osmo_dev_dir): cmd += [ "--volume", f"{osmo_dev_dir}:{osmo_dev_dir}", -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie470be84dd7b9f34dfe8ed461710c1964b481984 Gerrit-Change-Number: 43771 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: run osmo-dev logic for --binary-repo too
by osmith 06 Oct '26

06 Oct '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43772?usp=email ) Change subject: testenv: run osmo-dev logic for --binary-repo too ...................................................................... testenv: run osmo-dev logic for --binary-repo too Check if the testsuite we are running has any test components with package=no. If that is the case, check if osmo-dev is initialized and attempt to build the components with osmo-dev. The actual building needs further work done in follow-up patches. Related: OS#6638#note-12 Change-Id: I414e8e052c32acd8c2148b40eb5f75b57d1f293f --- M _testenv/testenv.py M _testenv/testenv/osmo_dev.py 2 files changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/_testenv/testenv.py b/_testenv/testenv.py index 01f6d95..5d6b043 100755 --- a/_testenv/testenv.py +++ b/_testenv/testenv.py @@ -35,7 +35,8 @@ testenv.testsrcdir_cfg.init() testenv.testenv_cfg.init() - if not testenv.args.binary_repo: + osmo_dev_has_any_targets = testenv.osmo_dev.has_any_targets() + if osmo_dev_has_any_targets: testenv.osmo_dev.check_init_needed() testenv.podman_install.init() @@ -52,7 +53,7 @@ testenv.testsuite.build() # Build all components first - if not testenv.args.binary_repo: + if osmo_dev_has_any_targets: for cfg_name, cfg in testenv.testenv_cfg.cfgs.items(): testenv.testenv_cfg.set_current(cfg_name) testenv.osmo_dev.init(cfg) diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 8f2fcfd..d67c5eb 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -59,11 +59,20 @@ continue if "make" in section_data and section_data["make"] != "no" and section_data["make"] not in ret: + if testenv.args.binary_repo and section_data.get("package", "no") != "no": + continue ret += [section_data["make"]] return ret +def has_any_targets(): + for cfg in testenv.testenv_cfg.cfgs.values(): + if get_targets(cfg): + return True + return False + + def init(cfg): extra_opts = [] if testenv.args.asan: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43772?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I414e8e052c32acd8c2148b40eb5f75b57d1f293f Gerrit-Change-Number: 43772 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: cmd: init_env: split up by envtype
by osmith 06 Oct '26

06 Oct '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43773?usp=email ) Change subject: testenv: cmd: init_env: split up by envtype ...................................................................... testenv: cmd: init_env: split up by envtype osmo-dev commands and components built with osmo-dev need to run with other environment variables (e.g. PATH, PKG_CONFIG_PATH) compared to test components that were installed from binary packages. Until now it was not possible to mix both, which means testenv would decide on startup which of the two it is and set everything accordingly. Split init_env and related variables up so we can do both at the same time. This is again needed to run the bts testsuite with binary packages except for osmo-trx-proxy and trxcon. This patch keeps the current behavior of using the binary_repo envtype if --binary-repo is set, and the osmo_dev envtype otherwise. The next patch makes mixing both possible. Related: OS#6638#note-12 Change-Id: Ib5532d8eab0a05d5390a92e88dcc67f5ab00eba9 --- M _testenv/testenv.py M _testenv/testenv/cmd.py M _testenv/testenv/osmo_dev.py 3 files changed, 82 insertions(+), 59 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/_testenv/testenv.py b/_testenv/testenv.py index 5d6b043..695a857 100755 --- a/_testenv/testenv.py +++ b/_testenv/testenv.py @@ -40,7 +40,10 @@ testenv.osmo_dev.check_init_needed() testenv.podman_install.init() - testenv.cmd.init_env() + if osmo_dev_has_any_targets: + testenv.cmd.init_env_osmo_dev() + if testenv.args.binary_repo: + testenv.cmd.init_env_binary_repo() testenv.testdir.init() testenv.daemons.init() diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 4da2360..0e35d2a 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -8,8 +8,8 @@ import testenv import testenv.testsuite -env_extra = {} -install_dir = None +env_extra = {"binary_repo": {}, "osmo_dev": {}} +install_dir = {"binary_repo": None, "osmo_dev": None} make_dir = None # osmo-dev make dir version, bump when making incompatible changes make_dir_version = 4 @@ -21,62 +21,78 @@ return f"-{re.sub('[^a-zA-Z0-9]', '-', testenv.args.distro)}" -def init_env(): +def init_env_common(envtype): """Adjust "Environment variables set by testenv" in README.md when making - changes here.""" + changes here or in other init_env_* functions below.""" + global env_extra + + env_extra[envtype]["TESTENV_INSTALL_DIR"] = install_dir[envtype] + + env_extra[envtype]["CCACHE_DIR"] = testenv.args.ccache + env_extra[envtype]["TESTENV_CACHE_DIR"] = testenv.args.cache + env_extra[envtype]["TESTENV_SRC_DIR"] = testenv.src_dir + + env_extra[envtype]["TERM"] = os.environ.get("TERM", "dumb") + + if testenv.args.kernel == "debian": + env_extra[envtype]["TESTENV_QEMU_KERNEL"] = "debian" + elif testenv.args.kernel == "custom": + env_extra[envtype]["TESTENV_QEMU_KERNEL"] = testenv.custom_kernel_path + if testenv.args.kernel: + env_extra[envtype]["TESTENV_QEMU_SCRIPTS"] = os.path.join(testenv.data_dir, "scripts/qemu") + + +def init_env_binary_repo(): + global install_dir + + if testenv.args.podman: + install_dir["binary_repo"] = "/" + else: + install_dir["binary_repo"] = os.path.join(testenv.args.cache, "host/install") + + init_env_common("binary_repo") + + +def init_env_osmo_dev(): global env_extra global install_dir global make_dir + # install_dir if testenv.args.podman: - if testenv.args.binary_repo: - install_dir = "/" - else: - install_dir = os.path.join(testenv.args.cache, "podman/install") - if testenv.args.asan: - install_dir += "-asan" - install_dir += distro_cache_suffix() - else: - install_dir = os.path.join(testenv.args.cache, "host/install") - - if not testenv.args.binary_repo: - pkg_config_path = os.path.join(install_dir, "lib/pkgconfig") - if "PKG_CONFIG_PATH" in os.environ: - pkg_config_path += f":{os.environ.get('PKG_CONFIG_PATH')}" - pkg_config_path += ":/usr/lib/pkgconfig" - - ld_library_path = os.path.join(install_dir, "lib") - if "LD_LIBRARY_PATH" in os.environ: - ld_library_path += f":{os.environ.get('LD_LIBRARY_PATH')}" - ld_library_path += ":/usr/lib" - - env_extra["PKG_CONFIG_PATH"] = pkg_config_path - env_extra["LD_LIBRARY_PATH"] = ld_library_path - - env_extra["CCACHE_DIR"] = testenv.args.ccache - env_extra["TESTENV_CACHE_DIR"] = testenv.args.cache - env_extra["TESTENV_SRC_DIR"] = testenv.src_dir - env_extra["TESTENV_INSTALL_DIR"] = install_dir - - env_extra["TERM"] = os.environ.get("TERM", "dumb") - - if not testenv.args.binary_repo: - if testenv.args.podman: - make_dir = os.path.join(testenv.args.cache, "podman", "make") - else: - make_dir = os.path.join(testenv.args.cache, "host", "make") - make_dir += str(make_dir_version) + install_dir["osmo_dev"] = os.path.join(testenv.args.cache, "podman/install") if testenv.args.asan: - make_dir += "-asan" - make_dir += distro_cache_suffix() - env_extra["OSMO_DEV_MAKE_DIR"] = make_dir + install_dir["osmo_dev"] += "-asan" + install_dir["osmo_dev"] += distro_cache_suffix() + else: + install_dir["osmo_dev"] = os.path.join(testenv.args.cache, "host/install") - if testenv.args.kernel == "debian": - env_extra["TESTENV_QEMU_KERNEL"] = "debian" - elif testenv.args.kernel == "custom": - env_extra["TESTENV_QEMU_KERNEL"] = testenv.custom_kernel_path - if testenv.args.kernel: - env_extra["TESTENV_QEMU_SCRIPTS"] = os.path.join(testenv.data_dir, "scripts/qemu") + # pkgconfig_path + pkg_config_path = os.path.join(install_dir["osmo_dev"], "lib/pkgconfig") + if "PKG_CONFIG_PATH" in os.environ: + pkg_config_path += f":{os.environ.get('PKG_CONFIG_PATH')}" + pkg_config_path += ":/usr/lib/pkgconfig" + env_extra["osmo_dev"]["PKG_CONFIG_PATH"] = pkg_config_path + + # ld_library_path + ld_library_path = os.path.join(install_dir["osmo_dev"], "lib") + if "LD_LIBRARY_PATH" in os.environ: + ld_library_path += f":{os.environ.get('LD_LIBRARY_PATH')}" + ld_library_path += ":/usr/lib" + env_extra["osmo_dev"]["LD_LIBRARY_PATH"] = ld_library_path + + # make_dir + if testenv.args.podman: + make_dir = os.path.join(testenv.args.cache, "podman", "make") + else: + make_dir = os.path.join(testenv.args.cache, "host", "make") + make_dir += str(make_dir_version) + if testenv.args.asan: + make_dir += "-asan" + make_dir += distro_cache_suffix() + env_extra["osmo_dev"]["OSMO_DEV_MAKE_DIR"] = make_dir + + init_env_common("osmo_dev") def exit_error_cmd(completed, error_msg): @@ -88,17 +104,17 @@ raise RuntimeError("shell command related error, find details right above this python trace") -def generate_env(env=None, podman=False): +def generate_env(env=None, podman=False, envtype="binary_repo"): env = env or {} - ret = dict(env_extra) + ret = dict(env_extra[envtype]) path = os.path.join(testenv.data_dir, "scripts") path += f":{os.path.join(testenv.data_dir, 'scripts/qemu')}" if testenv.args.action == "run" and testenv.ttcn3_hacks_dir: path += f":{os.path.join(testenv.ttcn3_hacks_dir, testenv.args.testsuite)}" - if install_dir and install_dir != "/": - path += f":{os.path.join(install_dir, 'bin')}" - path += f":{os.path.join(install_dir, 'usr/bin')}" + if install_dir[envtype] and install_dir[envtype] != "/": + path += f":{os.path.join(install_dir[envtype], 'bin')}" + path += f":{os.path.join(install_dir[envtype], 'usr/bin')}" if podman: path += ":/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" @@ -121,8 +137,12 @@ return ret -def run(cmd, check=True, env=None, no_podman=False, stdin=subprocess.DEVNULL, **kwargs): +def run(cmd, check=True, env=None, no_podman=False, stdin=subprocess.DEVNULL, envtype=None, **kwargs): env = env or {} + + if not envtype: + envtype = "binary_repo" if getattr(testenv.args, "binary_repo", True) else "osmo_dev" + if not no_podman and testenv.args.podman: return testenv.podman.exec_cmd(cmd, check=check, env=env, **kwargs) @@ -131,7 +151,7 @@ # Set stdin to /dev/null by default so we can still capture ^C with testenv p = subprocess.run( cmd, - env=generate_env(env), + env=generate_env(env, envtype=envtype), shell=isinstance(cmd, str), stdin=stdin, check=False, diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index d67c5eb..65dbfcc 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -86,7 +86,7 @@ "--build-debug", "--no-make-check", "--install-prefix", - testenv.cmd.install_dir, + testenv.cmd.install_dir["osmo_dev"], "--make-dir", testenv.cmd.make_dir, "--no-ldconfig", -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43773?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib5532d8eab0a05d5390a92e88dcc67f5ab00eba9 Gerrit-Change-Number: 43773 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log October 2026