November 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-dev[master]: ttcn3: fix missing test name in usage desc
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/35120?usp=email ) Change subject: ttcn3: fix missing test name in usage desc ...................................................................... ttcn3: fix missing test name in usage desc Change-Id: I5be5ee227dac0969e12d284ec518019c75698754 --- M ttcn3/ttcn3.sh 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/20/35120/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 3a501b0..85cbb6b 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -79,7 +79,7 @@ ;; h|*) local name="$(basename $0)" - echo "usage: $name [-h] [-t] [-d|-k [-f]] PROJECT" + echo "usage: $name [-h] [-t TESTNAME] [-d|-k [-f]] PROJECT" echo " or: $name clean" echo echo "arguments:" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/35120?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I5be5ee227dac0969e12d284ec518019c75698754 Gerrit-Change-Number: 35120 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: ttcn3: add aliases hss -> hss-ogs etc.
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/35119?usp=email ) Change subject: ttcn3: add aliases hss -> hss-ogs etc. ...................................................................... ttcn3: add aliases hss -> hss-ogs etc. Some open5gs testsuites end in -ogs (hss, mme, ggsn), others do not (pgw). Let the user omit -ogs and choose the right one automatically. Change-Id: I64fb519c15cfff8a8b560d51ff8b6b5d1aada8f7 --- M ttcn3/ttcn3.sh 1 file changed, 31 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/19/35119/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 701e323..3a501b0 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -34,6 +34,12 @@ exit 0 } +set_project() { + PROJECT="$1" + PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')" + PROJECT_NO_OGS="$(echo "$PROJECT" | sed 's/-ogs$//')" +} + parse_args() { while getopts 'ht:dkf' OPTION; do case "$OPTION" in @@ -95,7 +101,9 @@ echo " $name -k ggsn" echo " $name -k -f ggsn" echo " $name ggsn-ogs" - echo " $name hss-ogs" + echo " $name hss" + echo " $name mme" + echo " $name pgw" exit 1 ;; esac @@ -106,9 +114,16 @@ parse_args -h fi - PROJECT="$1" - PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')" - PROJECT_NO_OGS="$(echo "$PROJECT" | sed 's/-ogs$//')" + set_project "$1" + if ! [ -d "$(get_testsuite_dir_docker)" ]; then + set_project "$1-ogs" + if ! [ -d "$(get_testsuite_dir_docker)" ]; then + echo "ERROR: can't find testsuite_dir, adjust" \ + "get_testsuite_dir_docker" + fi + fi + + echo "PROJECT: $PROJECT" } check_usage() { -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/35119?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I64fb519c15cfff8a8b560d51ff8b6b5d1aada8f7 Gerrit-Change-Number: 35119 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: ttcn3: pgw: depend on osmo-uecups
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/35121?usp=email ) Change subject: ttcn3: pgw: depend on osmo-uecups ...................................................................... ttcn3: pgw: depend on osmo-uecups Change-Id: I95b77ea1a9f4c31c8886dc3f613e545135da320d --- M all.deps M ttcn3/ttcn3.sh 2 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/21/35121/1 diff --git a/all.deps b/all.deps index 7857f16..5a1191a 100644 --- a/all.deps +++ b/all.deps @@ -35,6 +35,7 @@ osmo-hnbgw osmo-iuh osmo-mgw libosmo-pfcp osmo-e1d libosmocore osmo-remsim simtrace2_host libosmo-netif +osmo-uecups libosmocore open5gs diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 85cbb6b..d665e84 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -187,9 +187,13 @@ # Programs that need to be built get_programs() { case "$PROJECT" in + # Open5gs + *-ogs) echo "open5gs" ;; + pgw) echo "open5gs osmo-uecups-daemon" ;; + + # Osmocom bsc|bsc-*) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;; bts) echo "osmo-bsc osmo-bts-trx" ;; - *-ogs|pgw) echo "open5gs" ;; msc) echo "osmo-stp osmo-msc" ;; pcu-sns) echo "osmo-pcu" ;; pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;; @@ -206,6 +210,7 @@ osmo-bts-*) echo "osmo-bts" ;; osmo-pcap-*) echo "osmo-pcap" ;; osmo-stp) echo "libosmo-sccp" ;; + osmo-uecups-*) echo "osmo-uecups" ;; *) echo "$1" ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/35121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I95b77ea1a9f4c31c8886dc3f613e545135da320d Gerrit-Change-Number: 35121 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: clean osmo-ttcn3-hacks too
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/35106?usp=email ) Change subject: ttcn3.sh: clean osmo-ttcn3-hacks too ...................................................................... ttcn3.sh: clean osmo-ttcn3-hacks too Change-Id: Id0fdf5e3f0917e56e3c6abff54a2f886367252f5 --- M ttcn3/ttcn3.sh 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/06/35106/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 54b4328..007fcc7 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -27,6 +27,11 @@ "$DIR_MAKE" \ "$DIR_OUTPUT" \ "$DIR_USR_LOCAL" + + if [ -d "$DIR_OSMODEV/src/osmo-ttcn3-hacks" ]; then + make -C "$DIR_OSMODEV/src/osmo-ttcn3-hacks" clean + fi + exit 0 } -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/35106?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Id0fdf5e3f0917e56e3c6abff54a2f886367252f5 Gerrit-Change-Number: 35106 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: add arg to only run one test
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/35108?usp=email ) Change subject: ttcn3.sh: add arg to only run one test ...................................................................... ttcn3.sh: add arg to only run one test Depends: docker-playground I1f45a05e089b429918096fcd64f7c02033d5a9dd Change-Id: I07a76f6c58d379608ecadfc3ba845651929f668c --- M ttcn3/ttcn3.sh 1 file changed, 23 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/08/35108/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index c315eda..3426e7b 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -8,6 +8,7 @@ JOBS="$(nproc)" KERNEL_DIR="" KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source" +ARG_TEST_NAME="" # Osmocom libraries and programs relevant for the current testsuite will be # built in this container. It must have all build dependencies available and @@ -38,8 +39,11 @@ } parse_args() { - while getopts 'hdkf' OPTION; do + while getopts 'ht:dkf' OPTION; do case "$OPTION" in + t) + ARG_TEST_NAME="$OPTARG" + ;; d) if [ -n "$KERNEL_TEST" ]; then echo "ERROR: use either -d or -k" @@ -73,11 +77,12 @@ ;; h|*) local name="$(basename $0)" - echo "usage: $name [-h] [-d|-k [-f]] PROJECT" + echo "usage: $name [-h] [-t] [-d|-k [-f]] PROJECT" echo " or: $name clean" echo echo "arguments:" echo " -h show help" + echo " -t only run the test with this name" echo echo "arguments for kernel tests:" echo " -d run kernel tests with debian kernel" @@ -89,7 +94,7 @@ echo "examples:" echo " $name bsc" echo " $name bsc-sccplite" - echo " $name hlr" + echo " $name -t TC_gsup_check_imei hlr" echo " $name -d ggsn" echo " $name -k ggsn" echo " $name -k -f ggsn" @@ -464,11 +469,15 @@ fi cd "$(get_testsuite_dir_docker)" - export DOCKER_ARGS="\ + DOCKER_ARGS="\ -e LD_LIBRARY_PATH=/usr/local/lib \ -v "$DIR_USR_LOCAL":/usr/local:ro \ -v $hacks:/osmo-ttcn3-hacks:ro \ " + if [ -n "$ARG_TEST_NAME" ]; then + DOCKER_ARGS="$DOCKER_ARGS -e TEST_NAME=$ARG_TEST_NAME" + fi + export DOCKER_ARGS export NO_LIST_OSMO_PACKAGES=1 ./jenkins.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/35108?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I07a76f6c58d379608ecadfc3ba845651929f668c Gerrit-Change-Number: 35108 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: enable color output from gcc
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/35110?usp=email ) Change subject: ttcn3.sh: enable color output from gcc ...................................................................... ttcn3.sh: enable color output from gcc Change-Id: Idde8084ca981333be2fc2b369ea8f25881470654 --- M ttcn3/scripts/docker_configure_make.sh 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/10/35110/1 diff --git a/ttcn3/scripts/docker_configure_make.sh b/ttcn3/scripts/docker_configure_make.sh index 56fee71..7a79ff1 100755 --- a/ttcn3/scripts/docker_configure_make.sh +++ b/ttcn3/scripts/docker_configure_make.sh @@ -26,6 +26,7 @@ docker run \ --rm \ + -t \ -e "LD_LIBRARY_PATH=/usr/local/lib" \ -v "$DIR_OSMODEV:$DIR_OSMODEV" \ -v "$DIR_USR_LOCAL:/usr/local" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/35110?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Idde8084ca981333be2fc2b369ea8f25881470654 Gerrit-Change-Number: 35110 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-dev[master]: ttcn3.sh: add options for kernel tests
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/35107?usp=email ) Change subject: ttcn3.sh: add options for kernel tests ...................................................................... ttcn3.sh: add options for kernel tests Change-Id: I2a569b6712d8930807750751c14ed4e18b325e02 --- M ttcn3/ttcn3.sh 1 file changed, 102 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/07/35107/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 007fcc7..c315eda 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -6,6 +6,8 @@ DIR_OUTPUT="${DIR_OUTPUT:-${DIR_OSMODEV}/ttcn3/out}" DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local" JOBS="$(nproc)" +KERNEL_DIR="" +KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source" # Osmocom libraries and programs relevant for the current testsuite will be # built in this container. It must have all build dependencies available and @@ -36,19 +38,61 @@ } parse_args() { - while getopts 'h' OPTION; do + while getopts 'hdkf' OPTION; do case "$OPTION" in + d) + if [ -n "$KERNEL_TEST" ]; then + echo "ERROR: use either -d or -k" + exit 1 + fi + export KERNEL_TEST=1 + ;; + k) + if [ -n "$KERNEL_TEST" ]; then + echo "ERROR: use either -d or -k" + exit 1 + fi + if [ -z "$KERNEL_DIR" ]; then + KERNEL_DIR="$(realpath "$DIR_OSMODEV/../linux")" + fi + if ! [ -e "$KERNEL_DIR/Kbuild" ]; then + echo "ERROR: KERNEL_DIR is invalid: $KERNEL_DIR" + exit 1 + fi + + export KERNEL_TEST=1 + export KERNEL_BUILD=1 + export KERNEL_SKIP_REBUILD=1 + ;; + f) + if [ -z "$KERNEL_BUILD" ]; then + echo "ERROR: don't use -f without -k" + exit 1 + fi + rm -f "$KERNEL_SKIP_MARKER" + ;; h|*) local name="$(basename $0)" - echo "usage: $name [-h] PROJECT" + echo "usage: $name [-h] [-d|-k [-f]] PROJECT" echo " or: $name clean" + echo echo "arguments:" echo " -h show help" + echo + echo "arguments for kernel tests:" + echo " -d run kernel tests with debian kernel" + echo " -k run kernel tests with kernel built from source" + echo " -f (use with -k) don't skip build if kernel already exists" + echo echo " PROJECT the testsuite project to run" + echo echo "examples:" echo " $name bsc" echo " $name bsc-sccplite" echo " $name hlr" + echo " $name -d ggsn" + echo " $name -k ggsn" + echo " $name -k -f ggsn" exit 1 ;; esac @@ -361,6 +405,52 @@ " } +# Similar to update_kernel_config in docker-playground +# scripts/kernel-test/kernel-build.sh +update_kernel_config() { + local previous="$DIR_MAKE/.kernel.previous.config" + local fragment="$(get_testsuite_dir_docker)/fragment.config" + + set -x + make defconfig + scripts/kconfig/merge_config.sh -m .config "$fragment" + make olddefconfig + set +x + + if [ -e "$previous" ] && ! diff -q "$previous" .config; then + # Remove everything built with previous config + echo "Kernel config changed, running 'make clean'" + make clean + fi + + cp .config "$previous" +} + +build_kernel() { + local image="arch/x86/boot/bzImage" + + if [ -z "$KERNEL_DIR" ]; then + return + fi + + cd "$KERNEL_DIR" + if ! [ -e "$image" ]; then + rm -f "$KERNEL_SKIP_MARKER" + fi + if ! [ -e "$KERNEL_SKIP_MARKER" ]; then + update_kernel_config + make -j"$JOBS" + fi + + # Copy the kernel to the path expected by + # docker-playground scripts/kernel-test/kernel-build.sh + local dest="$DIR_OSMODEV/src/docker-playground/_cache/linux/$image" + mkdir -p "$(dirname "$dest")" + cp "$image" "$dest" + + touch "$KERNEL_SKIP_MARKER" +} + run_docker() { local hacks="${DIR_OSMODEV}/src/osmo-ttcn3-hacks" local docker_dir="$(get_testsuite_dir_docker)" @@ -417,6 +507,7 @@ prepare_docker_build_container build_extra_libraries build_osmo_programs +build_kernel prepare_docker_testsuite_container build_testsuite remove_old_logs -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/35107?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I2a569b6712d8930807750751c14ed4e18b325e02 Gerrit-Change-Number: 35107 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: werror.opts: add libgtpnl
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/35109?usp=email ) Change subject: werror.opts: add libgtpnl ...................................................................... werror.opts: add libgtpnl Depends: libgtpnl Ife3716c667d2e9b3fcd94d3cdc044d594e7dab5a Change-Id: Ia5f6f6d2641318c00608471256257b4e06627c7c --- M werror.opts 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/09/35109/1 diff --git a/werror.opts b/werror.opts index 312b97b..3b27b74 100644 --- a/werror.opts +++ b/werror.opts @@ -6,6 +6,7 @@ libosmo-sccp --enable-werror libosmo-pfcp --enable-werror libsmpp34 --enable-werror +libgtpnl --enable-werror osmo-bsc --enable-werror osmo-ggsn --enable-werror osmo-hlr --enable-werror -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/35109?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia5f6f6d2641318c00608471256257b4e06627c7c Gerrit-Change-Number: 35109 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: gen_makefile: update URL code for netfilter urls
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/35111?usp=email ) Change subject: gen_makefile: update URL code for netfilter urls ...................................................................... gen_makefile: update URL code for netfilter urls * libgtnpnl is now developed at gerrit.osmocom.org * use https:// instead of git:// for libnftnl, nftables * read the urls from a new all.urls file * don't set a push URL pointing to gerrit for projects that have different URLs Change-Id: I5522c9fcc594d296c581ba59c0beb4882e2d976e --- A all.urls M gen_makefile.py 2 files changed, 43 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/11/35111/1 diff --git a/all.urls b/all.urls new file mode 100644 index 0000000..27aaf6e --- /dev/null +++ b/all.urls @@ -0,0 +1,4 @@ +# Git clone URLs for projects not developed at gerrit.osmocom.org +# project url +libnftnl https://git.netfilter.org/libnftnl/ +nftables https://git.netfilter.org/nftables/ diff --git a/gen_makefile.py b/gen_makefile.py index a00234f..9a8a5cf 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -52,6 +52,7 @@ topdir = os.path.dirname(os.path.realpath(__file__)) all_deps_file = os.path.join(topdir, "all.deps") +all_urls_file = os.path.join(topdir, "all.urls") parser = argparse.ArgumentParser(epilog=__doc__, formatter_class=argparse.RawTextHelpFormatter) parser.add_argument('configure_opts_files', @@ -148,6 +149,18 @@ l.append((tokens[0], tokens[1:])) return l +def read_projects_urls(path): + 'Read urls config and return dict {project_name: url, …}.' + ret = {} + for line in open(path): + line = line.strip() + if not line or line.startswith('#'): + continue + project, url = line.split() + assert project not in ret, f"project '{project} found twice in {path}" + ret[project] = url + return ret + def read_configure_opts(path): 'Read config opts file and return tuples of (project_name, config-opts).' if not path: @@ -179,14 +192,21 @@ touch $@ ''' - if proj in ("libgtpnl", "libnftnl", "nftables"): - url = "git://git.netfilter.org" + if proj in projects_urls: + url = projects_urls[proj] + cmd_set_push_url = "true" + else: + url = f"{url}/{proj}" + push_url = f"{push_url}/{proj}" + cmd_set_push_url = f'git -C "{src}/{proj}" remote set-url --push origin "{push_url}"' + + cmd_clone = f'git -C {src} clone --recurse-submodules "{url}" "{proj}"' return f''' .make.{proj}.clone: @echo -e "\\n\\n\\n===== $@\\n" test -d {src} || mkdir -p {src} - test -d {src_proj} || ( git -C {src} clone --recurse-submodules "{url}/{proj}" "{proj}" && git -C "{src}/{proj}" remote set-url --push origin "{push_url}/{proj}" ) + test -d {src_proj} || ( {cmd_clone} && {cmd_set_push_url} ) sync touch $@ ''' @@ -303,6 +323,7 @@ projects_deps = read_projects_deps(all_deps_file) +projects_urls = read_projects_urls(all_urls_file) configure_opts = listdict() configure_opts_files = sorted(args.configure_opts_files or []) for configure_opts_file in configure_opts_files: -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/35111?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I5522c9fcc594d296c581ba59c0beb4882e2d976e Gerrit-Change-Number: 35111 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: open5gs configs: duplicate cfgs for latest/master
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/35104?usp=email ) Change subject: open5gs configs: duplicate cfgs for latest/master ...................................................................... open5gs configs: duplicate cfgs for latest/master The config format just changed significantly in main/master. Duplicate the configs, so we can run latest with the old versions. Related: OS#6267 Change-Id: I2446695172b92ccf75305f878cb932a82e44fdd2 --- M ttcn3-ggsn-test/jenkins-ogs.sh R ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml C ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml R ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml C ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml M ttcn3-hss-test-ogs/jenkins.sh R ttcn3-hss-test-ogs/ogs/open5gs-hss-latest.yaml C ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml M ttcn3-mme-test-ogs/jenkins.sh R ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml C ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml M ttcn3-pgw-test/jenkins.sh R ttcn3-pgw-test/open5gs-nrf-latest.yaml C ttcn3-pgw-test/open5gs-nrf-master.yaml R ttcn3-pgw-test/open5gs-smf-latest.yaml C ttcn3-pgw-test/open5gs-smf-master.yaml R ttcn3-pgw-test/open5gs-upf-latest.yaml C ttcn3-pgw-test/open5gs-upf-master.yaml 18 files changed, 27 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/04/35104/1 diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh index 5875b75..07952bc 100755 --- a/ttcn3-ggsn-test/jenkins-ogs.sh +++ b/ttcn3-ggsn-test/jenkins-ogs.sh @@ -16,7 +16,7 @@ write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg" mkdir $VOL_BASE_DIR/ggsn -cp ogs/open5gs-*.yaml $VOL_BASE_DIR/ggsn/ +cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/ggsn/ cp ogs/freediameter.conf $VOL_BASE_DIR/ggsn/ cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/ cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/ @@ -35,9 +35,9 @@ $DOCKER_ARGS \ $(docker_network_params $SUBNET 201) \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" - #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" - #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" + /bin/sh -c "open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" + #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" + #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" docker run --cap-add=NET_ADMIN \ --device /dev/net/tun:/dev/net/tun \ @@ -49,7 +49,7 @@ $DOCKER_ARGS \ $(docker_network_params $SUBNET 222) \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml >/data/open5gs-upfd.out 2>&1" + /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf-$IMAGE_SUFFIX.yaml >/data/open5gs-upfd.out 2>&1" # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml similarity index 100% rename from ttcn3-ggsn-test/ogs/open5gs-smf.yaml rename to ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml similarity index 100% copy from ttcn3-ggsn-test/ogs/open5gs-smf.yaml copy to ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml similarity index 100% rename from ttcn3-ggsn-test/ogs/open5gs-upf.yaml rename to ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml similarity index 100% copy from ttcn3-ggsn-test/ogs/open5gs-upf.yaml copy to ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml diff --git a/ttcn3-hss-test-ogs/jenkins.sh b/ttcn3-hss-test-ogs/jenkins.sh index 0eacaf9..eb60835 100755 --- a/ttcn3-hss-test-ogs/jenkins.sh +++ b/ttcn3-hss-test-ogs/jenkins.sh @@ -18,7 +18,7 @@ write_mp_osmo_repo "$VOL_BASE_DIR/hss-tester/HSS_Tests.cfg" mkdir $VOL_BASE_DIR/hss -cp ogs/open5gs-*.yaml $VOL_BASE_DIR/hss/ +cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/hss/ cp ogs/freediameter.conf $VOL_BASE_DIR/hss/ network_create @@ -64,7 +64,7 @@ $DOCKER_ARGS \ $(docker_network_params $SUBNET 201) \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "open5gs-hssd -c /data/open5gs-hss.yaml >/data/open5gs-hssd.out 2>&1" + /bin/sh -c "open5gs-hssd -c /data/open5gs-hss-$IMAGE_SUFFIX.yaml >/data/open5gs-hssd.out 2>&1" # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss-latest.yaml similarity index 100% rename from ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml rename to ttcn3-hss-test-ogs/ogs/open5gs-hss-latest.yaml diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml similarity index 100% copy from ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml copy to ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml diff --git a/ttcn3-mme-test-ogs/jenkins.sh b/ttcn3-mme-test-ogs/jenkins.sh index 164123a..069b990 100755 --- a/ttcn3-mme-test-ogs/jenkins.sh +++ b/ttcn3-mme-test-ogs/jenkins.sh @@ -15,7 +15,7 @@ write_mp_osmo_repo "$VOL_BASE_DIR/mme-tester/MME_Tests.cfg" mkdir $VOL_BASE_DIR/mme -cp ogs/open5gs-*.yaml $VOL_BASE_DIR/mme/ +cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/mme/ cp ogs/freediameter.conf $VOL_BASE_DIR/mme/ cp ogs/mme.sh $VOL_BASE_DIR/mme/ @@ -31,7 +31,7 @@ $DOCKER_ARGS \ $(docker_network_params $SUBNET 201) \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "open5gs-mmed -c /data/open5gs-mme.yaml >/data/open5gs-mmed.out 2>&1" + /bin/sh -c "open5gs-mmed -c /data/open5gs-mme-$IMAGE_SUFFIX.yaml >/data/open5gs-mmed.out 2>&1" # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml similarity index 100% rename from ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml rename to ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml similarity index 100% copy from ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml copy to ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh index 8311bac..3e10a13 100755 --- a/ttcn3-pgw-test/jenkins.sh +++ b/ttcn3-pgw-test/jenkins.sh @@ -15,7 +15,7 @@ mkdir $VOL_BASE_DIR/pgw cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/ -cp open5gs-*.yaml $VOL_BASE_DIR/pgw/ +cp open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/pgw/ cp upfd.sh $VOL_BASE_DIR/pgw/ cp upfd-setup.sh $VOL_BASE_DIR/pgw/ @@ -33,7 +33,7 @@ --name ${BUILD_TAG}-nrf -d \ $DOCKER_ARGS \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "open5gs-nrfd -c /data/open5gs-nrf.yaml >/data/open5gs-nrf.out 2>&1" + /bin/sh -c "open5gs-nrfd -c /data/open5gs-nrf-$IMAGE_SUFFIX.yaml >/data/open5gs-nrf.out 2>&1" # start container with open5gs-upfd in background docker run --cap-add=NET_ADMIN \ @@ -46,7 +46,7 @@ --name ${BUILD_TAG}-upf -d \ $DOCKER_ARGS \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml >/data/open5gs-upfd.out 2>&1" + /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf-$IMAGE_SUFFIX.yaml >/data/open5gs-upfd.out 2>&1" # start container with open5gs-smfd in background docker run --cap-add=NET_ADMIN \ @@ -59,8 +59,8 @@ --name ${BUILD_TAG}-smf -d \ $DOCKER_ARGS \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" - #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" + /bin/sh -c "open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" + #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" # start container with osmo-ugcups-daemon in background; SYS_ADMIN required for CLONE_NEWNS docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN \ diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf-latest.yaml similarity index 100% rename from ttcn3-pgw-test/open5gs-nrf.yaml rename to ttcn3-pgw-test/open5gs-nrf-latest.yaml diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf-master.yaml similarity index 100% copy from ttcn3-pgw-test/open5gs-nrf.yaml copy to ttcn3-pgw-test/open5gs-nrf-master.yaml diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf-latest.yaml similarity index 100% rename from ttcn3-pgw-test/open5gs-smf.yaml rename to ttcn3-pgw-test/open5gs-smf-latest.yaml diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf-master.yaml similarity index 100% copy from ttcn3-pgw-test/open5gs-smf.yaml copy to ttcn3-pgw-test/open5gs-smf-master.yaml diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf-latest.yaml similarity index 100% rename from ttcn3-pgw-test/open5gs-upf.yaml rename to ttcn3-pgw-test/open5gs-upf-latest.yaml diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf-master.yaml similarity index 100% copy from ttcn3-pgw-test/open5gs-upf.yaml copy to ttcn3-pgw-test/open5gs-upf-master.yaml -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35104?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2446695172b92ccf75305f878cb932a82e44fdd2 Gerrit-Change-Number: 35104 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0