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

[S] Change in osmo-ci[master]: scripts/common: osmo git last commit…: add vars
by laforge 19 Oct '23

19 Oct '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34816?usp=email ) Change subject: scripts/common: osmo_git_last_commit…: add vars ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34816?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: I7abbcefc8d5bd4c5b84c30a7e38ca3dcb855dd56 Gerrit-Change-Number: 34816 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:16:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-e1-recorder
by laforge 19 Oct '23

19 Oct '23

Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email ) Change subject: scripts/tarballs: add osmo-e1-recorder ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34815?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: I6bd8387f99c258226125b33705645c43aadd875f Gerrit-Change-Number: 34815 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:16:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: Introduce osmo-epdg-master
by pespin 19 Oct '23

19 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34797?usp=email ) Change subject: Introduce osmo-epdg-master ...................................................................... Introduce osmo-epdg-master Related: OS#6204 Change-Id: Iefc43ffa47f443f2826b8979d4dd0c5542dda1c5 --- M jenkins-common.sh M make/Makefile A osmo-epdg-master/Dockerfile A osmo-epdg-master/Makefile A osmo-epdg-master/osmo-epdg.config 5 files changed, 44 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jenkins-common.sh b/jenkins-common.sh index c9299df..4e476f6 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -22,6 +22,7 @@ osmo-*-centos8) echo "centos8-build" ;; osmo-*-latest) echo "debian-$DEBIAN_DEFAULT-obs-latest" ;; osmo_dia2gsup-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;; + osmo-epdg-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;; osmo-*) echo "debian-$DEBIAN_DEFAULT-build" ;; open5gs-master) echo "debian-$DEBIAN_DEFAULT-build" ;; ttcn3-*) echo "debian-bookworm-titan" ;; diff --git a/make/Makefile b/make/Makefile index f007f2a..7266662 100644 --- a/make/Makefile +++ b/make/Makefile @@ -24,6 +24,7 @@ OSMO_BTS_BRANCH?=master OSMO_CBC_BRANCH?=master OSMO_DIA2GSUP_BRANCH?=master +OSMO_EPDG_BRANCH?=master OSMO_GBPROXY_BRANCH?=master OSMO_GGSN_BRANCH?=master OSMO_GSM_TESTER_BRANCH?=master @@ -105,6 +106,7 @@ --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \ --build-arg OSMO_CBC_BRANCH=$(OSMO_CBC_BRANCH) \ --build-arg OSMO_DIA2GSUP_BRANCH=$(OSMO_DIA2GSUP_BRANCH) \ + --build-arg OSMO_EPDG_BRANCH=$(OSMO_EPDG_BRANCH) \ --build-arg OSMO_GBPROXY_BRANCH=$(OSMO_GBPROXY_BRANCH) \ --build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \ --build-arg OSMO_GSM_TESTER_BRANCH=$(OSMO_GSM_TESTER_BRANCH) \ diff --git a/osmo-epdg-master/Dockerfile b/osmo-epdg-master/Dockerfile new file mode 100644 index 0000000..58ccf9a --- /dev/null +++ b/osmo-epdg-master/Dockerfile @@ -0,0 +1,28 @@ +ARG USER +ARG DISTRO +FROM $USER/$DISTRO-erlang +# Arguments used after FROM must be specified again +ARG DISTRO + +WORKDIR /tmp + +ARG OSMO_EPDG_BRANCH="master" + +RUN git clone https://gerrit.osmocom.org/erlang/osmo-epdg.git +ADD https://gerrit.osmocom.org/plugins/gitiles/erlang/osmo-epdg/+/$OSMO_EPDG_BR… /tmp/commit-osmo-epdg + +RUN cd osmo-epdg && \ + git fetch && git checkout $OSMO_EPDG_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_EPDG_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + rebar3 compile && \ + rebar3 escriptize + +VOLUME /data + +COPY osmo-epdg.config /data/osmo-epdg.config + +WORKDIR /data +CMD ["/bin/sh", "-c", "ERL_FLAGS='-config /data/osmo-epdg.config' /tmp/osmo-epdg/_build/default/bin/osmo-epdg > /data/osmo-epdg.log 2>&1"] + +#EXPOSE diff --git a/osmo-epdg-master/Makefile b/osmo-epdg-master/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-epdg-master/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-epdg-master/osmo-epdg.config b/osmo-epdg-master/osmo-epdg.config new file mode 100644 index 0000000..be49216 --- /dev/null +++ b/osmo-epdg-master/osmo-epdg.config @@ -0,0 +1,2 @@ +[{osmo_epdg, [ +]}]. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34797?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: Iefc43ffa47f443f2826b8979d4dd0c5542dda1c5 Gerrit-Change-Number: 34797 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in docker-playground[master]: Introduce ttcn3-epdg-test
by pespin 19 Oct '23

19 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34798?usp=email ) Change subject: Introduce ttcn3-epdg-test ...................................................................... Introduce ttcn3-epdg-test Change-Id: I77a4d66c1bd0236dee8fc54e03a9d6bf8d63f204 --- A ttcn3-epdg-test/Dockerfile A ttcn3-epdg-test/EPDG_Tests.cfg A ttcn3-epdg-test/Makefile A ttcn3-epdg-test/jenkins.sh A ttcn3-epdg-test/osmo-epdg.config 5 files changed, 102 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/ttcn3-epdg-test/Dockerfile b/ttcn3-epdg-test/Dockerfile new file mode 100644 index 0000000..e3fd8a3 --- /dev/null +++ b/ttcn3-epdg-test/Dockerfile @@ -0,0 +1,14 @@ +ARG REGISTRY +ARG USER +FROM $REGISTRY/$USER/debian-bookworm-titan + +ARG OSMO_TTCN3_BRANCH="master" + +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" epdg + +VOLUME /data + +COPY EPDG_Tests.cfg /data/EPDG_Tests.cfg + +CMD ttcn3-docker-run epdg EPDG_Tests diff --git a/ttcn3-epdg-test/EPDG_Tests.cfg b/ttcn3-epdg-test/EPDG_Tests.cfg new file mode 100644 index 0000000..f05a819 --- /dev/null +++ b/ttcn3-epdg-test/EPDG_Tests.cfg @@ -0,0 +1,21 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/epdg/EPDG_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +EPDG_Tests.mp_gsup_local_ip := "172.18.10.103" +EPDG_Tests.mp_swx_local_ip := "172.18.10.103" +EPDG_Tests.mp_s6b_local_ip := "172.18.10.103" +EPDG_Tests.mp_s2b_local_ip := "172.18.10.103" + +EPDG_Tests.mp_gsup_remote_ip := "172.18.10.20" +EPDG_Tests.mp_s2b_remote_ip := "172.18.10.20" + +[MAIN_CONTROLLER] + +[EXECUTE] +EPDG_Tests.control diff --git a/ttcn3-epdg-test/Makefile b/ttcn3-epdg-test/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/ttcn3-epdg-test/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/ttcn3-epdg-test/jenkins.sh b/ttcn3-epdg-test/jenkins.sh new file mode 100755 index 0000000..df445fc --- /dev/null +++ b/ttcn3-epdg-test/jenkins.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "osmo-epdg-$IMAGE_SUFFIX" \ + "ttcn3-epdg-test" + +set_clean_up_trap +set -e + +mkdir $VOL_BASE_DIR/epdg-tester +cp EPDG_Tests.cfg $VOL_BASE_DIR/epdg-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/epdg-tester/EPDG_Tests.cfg" + +mkdir $VOL_BASE_DIR/epdg +cp osmo-epdg.config $VOL_BASE_DIR/epdg/ + +network_create +network_replace_subnet_in_configs + +echo Starting container with osmo-epdg +docker run --rm \ + $(docker_network_params $SUBNET 20) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/epdg:/data \ + --name ${BUILD_TAG}-epdg -d \ + $DOCKER_ARGS \ + $REPO_USER/osmo-epdg-$IMAGE_SUFFIX + +echo Starting container with EPDG testsuite +docker run --rm \ + $(docker_network_params $SUBNET 103) \ + --ulimit core=-1 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/epdg-tester:/data \ + --name ${BUILD_TAG}-ttcn3-epdg-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-epdg-test diff --git a/ttcn3-epdg-test/osmo-epdg.config b/ttcn3-epdg-test/osmo-epdg.config new file mode 100644 index 0000000..ac8828a --- /dev/null +++ b/ttcn3-epdg-test/osmo-epdg.config @@ -0,0 +1,18 @@ +[ + %% =========================================== + %% Application config + %% =========================================== + {osmo_epdg, + [% GSUP Server connection parameters + {gsup_local_ip, "172.18.10.20"}, + {gsup_local_port, 4222}, + % Diameter Connection parameters + {diameter_remote_ip, "172.18.10.103"}, + {diameter_remote_port, 3868}, + {diameter_proto, sctp}, + % Diameter Server parameters + {vendor_id, 0}, + {origin_host, "epdg.localdomain"}, + {origin_realm, "localdomain"}, + {context_id, "epdg@localdomain"}]} +]. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34798?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: I77a4d66c1bd0236dee8fc54e03a9d6bf8d63f204 Gerrit-Change-Number: 34798 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in pysim[master]: Use keyword argument for file description argument
by pespin 19 Oct '23

19 Oct '23

Attention is currently required from: dexter, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34814?usp=email ) Change subject: Use keyword argument for file description argument ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34814?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: Icfb3fd1bae038c54fa14a91aa9f75219d839968c Gerrit-Change-Number: 34814 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:15:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: ts_31_102: Fix initialization of file size
by pespin 19 Oct '23

19 Oct '23

Attention is currently required from: dexter, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34813?usp=email ) Change subject: ts_31_102: Fix initialization of file size ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34813?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: I7f32c9fd01094620b68b0e54536ecc6cdbe67903 Gerrit-Change-Number: 34813 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:14:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: scripts/common: osmo git last commit…: add vars
by osmith 19 Oct '23

19 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34816?usp=email ) Change subject: scripts/common: osmo_git_last_commit…: add vars ...................................................................... scripts/common: osmo_git_last_commit…: add vars Add variable names for $1, $2, $3 so the logic is easier to follow. Related: OS#6227 Change-Id: I7abbcefc8d5bd4c5b84c30a7e38ca3dcb855dd56 --- M scripts/common.sh 1 file changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/16/34816/1 diff --git a/scripts/common.sh b/scripts/common.sh index 72be4fc..8099499 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -74,19 +74,23 @@ # ee618ecbedec82dfd240334bc87d0d1c806477b0 refs/tags/debian/0.9.13-0_jrsantos.1 # a3fdd24af099b449c9856422eb099fb45a5595df refs/tags/debian/0.9.13-0_jrsantos.1^{} # ... + local project="$1" + local amount="$2" + local default_str="$3" local url ret - url="$(osmo_git_clone_url "$1")" + + url="$(osmo_git_clone_url "$project")" ret="$(git ls-remote --tags "$url")" ret="$(echo "$ret" | grep 'refs/tags/[0-9.]*$' || true)" ret="$(echo "$ret" | sort -V -t/ -k3)" - if [ "$2" != "all" ]; then - ret="$(echo "$ret" | tail -n "$2")" + if [ "$amount" != "all" ]; then + ret="$(echo "$ret" | tail -n "$amount")" fi if [ -n "$ret" ]; then echo "$ret" else - echo "$3" + echo "$default_str" fi } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34816?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: I7abbcefc8d5bd4c5b84c30a7e38ca3dcb855dd56 Gerrit-Change-Number: 34816 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ci[master]: scripts/tarballs: add gapk
by osmith 19 Oct '23

19 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email ) Change subject: scripts/tarballs: add gapk ...................................................................... scripts/tarballs: add gapk Closes: OS#6227 Change-Id: I6f26b6f5953701b383acb3b93058b66a286f7989 --- M scripts/common.sh A scripts/tarballs/prefer-configure.sh M scripts/tarballs/publish-tarballs-for-tags.sh 3 files changed, 48 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/34817/1 diff --git a/scripts/common.sh b/scripts/common.sh index 8099499..194feff 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -77,11 +77,20 @@ local project="$1" local amount="$2" local default_str="$3" - local url ret + local url ret pattern + + case "$project" in + gapk) + pattern='refs/tags/v[0-9.]*$' + ;; + *) + pattern='refs/tags/[0-9.]*$' + ;; + esac url="$(osmo_git_clone_url "$project")" ret="$(git ls-remote --tags "$url")" - ret="$(echo "$ret" | grep 'refs/tags/[0-9.]*$' || true)" + ret="$(echo "$ret" | grep "$pattern" || true)" ret="$(echo "$ret" | sort -V -t/ -k3)" if [ "$amount" != "all" ]; then ret="$(echo "$ret" | tail -n "$amount")" diff --git a/scripts/tarballs/prefer-configure.sh b/scripts/tarballs/prefer-configure.sh new file mode 100755 index 0000000..f9f8613 --- /dev/null +++ b/scripts/tarballs/prefer-configure.sh @@ -0,0 +1,25 @@ +#!/bin/sh -ex +# Decide whether to build a tarball from autotools logic (exit 0) or by +# creating a simple git archive (exit 1) + +PROJECT="$1" +TAG="$2" + +if ! [ -e configure.ac ]; then + exit 1 +fi + +case "$PROJECT" in +gapk) + # Running gapk's configure involves running libgsmhr/fetch_sources.py, + # which according to git log doesn't really work unless using the + # version from master and it looks like we don't want to distribute + # these sources directly... or else we should just add them to the git + # repository and not rely on downloading a remote archive that may just + # change at any time. So create a simple git archive instead. + exit 1 + ;; +*) + exit 0 + ;; +esac diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index 3cd8a15..26e949f 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -8,6 +8,7 @@ LOG_PREFIX="::" OSMO_RELEASE_REPOS=" + gapk libasn1c libgtpnl libosmo-abis @@ -237,7 +238,7 @@ cd /src/$project_path - if [ -e configure.ac ]; then + if /tarballs/prefer-configure.sh \"$repo\" \"$tag\"; then su build -c \"autoreconf -fi\" case \"$repo\" in osmo-trx) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34817?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: I6f26b6f5953701b383acb3b93058b66a286f7989 Gerrit-Change-Number: 34817 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-fl2k, rtl-sdr
by osmith 19 Oct '23

19 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email ) Change subject: scripts/tarballs: add osmo-fl2k, rtl-sdr ...................................................................... scripts/tarballs: add osmo-fl2k, rtl-sdr Closes: OS#6226, OS#6225 Change-Id: Idff299c65902b6818e409a409a3d303e8fccc4f9 --- M scripts/common.sh M scripts/tarballs/publish-tarballs-for-tags.sh 2 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/18/34818/1 diff --git a/scripts/common.sh b/scripts/common.sh index 194feff..2bca384 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -80,7 +80,7 @@ local url ret pattern case "$project" in - gapk) + gapk|osmo-fl2k) pattern='refs/tags/v[0-9.]*$' ;; *) diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index 26e949f..e3dbf5b 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -23,6 +23,7 @@ osmo-cbc osmo-e1-recorder osmo-e1d + osmo-fl2k osmo-gbproxy osmo-ggsn osmo-gsm-manuals @@ -42,6 +43,7 @@ osmo-trx osmo-uecups osmocom-bb + rtl-sdr simtrace2 " -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34818?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: Idff299c65902b6818e409a409a3d303e8fccc4f9 Gerrit-Change-Number: 34818 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-e1-recorder
by osmith 19 Oct '23

19 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email ) Change subject: scripts/tarballs: add osmo-e1-recorder ...................................................................... scripts/tarballs: add osmo-e1-recorder Closes: OS#6228 Change-Id: I6bd8387f99c258226125b33705645c43aadd875f --- M .gitignore A scripts/tarballs/install-depends.sh M scripts/tarballs/publish-tarballs-for-tags.sh 3 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/15/34815/1 diff --git a/.gitignore b/.gitignore index 517a620..5f47674 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ cov-analysis-* source-* install-* +!install-depends.sh tokens.txt .*.sw? jenkins_jobs.ini diff --git a/scripts/tarballs/install-depends.sh b/scripts/tarballs/install-depends.sh new file mode 100755 index 0000000..4943712 --- /dev/null +++ b/scripts/tarballs/install-depends.sh @@ -0,0 +1,25 @@ +#!/bin/sh -ex +# For releases where no debian/control exists, install the dependencies to pass +# the checks in configure.ac so we can run it before building a release +# tarball. + +PROJECT="$1" +TAG="$2" +DEPENDS="" + +case "$PROJECT" in +osmo-e1-recorder) + DEPENDS=" + libosmo-abis-dev + libosmocore-dev + " + ;; +*) + DEPENDS="" + ;; +esac + +if [ -n "$DEPENDS" ]; then + apt-get update + apt-get install -y --no-install-recommends $DEPENDS +fi diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index 052e445..3cd8a15 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -20,6 +20,7 @@ osmo-bsc osmo-bts osmo-cbc + osmo-e1-recorder osmo-e1d osmo-gbproxy osmo-ggsn @@ -230,6 +231,8 @@ if [ -e debian/control ]; then apt-get update apt-get -y build-dep . + else + /tarballs/install-depends.sh \"$repo\" \"$tag\" fi cd /src/$project_path -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34815?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: I6bd8387f99c258226125b33705645c43aadd875f Gerrit-Change-Number: 34815 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0