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

[M] Change in osmo-ci[master]: repo-install-test: add debian12

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34037 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: repo-install-test: add debian12 ...................................................................... repo-install-test: add debian12 Related: OS#6057 Change-Id: I51fa3c5212b5e29f4c2804384781693e8de2c097 --- M ansible/roles/qemu/files/qemu-create-vms.sh M ansible/roles/qemu/tasks/main.yml M jobs/repo-install-test.yml M scripts/repo-install-test.sh A scripts/repo-install-test/blacklist_debian12.txt M scripts/repo-install-test/run-inside.sh 6 files changed, 106 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved osmith: Verified diff --git a/ansible/roles/qemu/files/qemu-create-vms.sh b/ansible/roles/qemu/files/qemu-create-vms.sh index 8cceba8..a6ee8e7 100755 --- a/ansible/roles/qemu/files/qemu-create-vms.sh +++ b/ansible/roles/qemu/files/qemu-create-vms.sh @@ -10,6 +10,7 @@ alma-8.5 debian-10 debian-11 + debian-12 " TEMP_SCRIPT="$(mktemp)" @@ -53,13 +54,22 @@ ;; esac + EXTRA_ARGS="" + case "$distro" in + debian-12) + # repo-install-test runs out of space with the default size + EXTRA_ARGS="--size 8G" + ;; + esac + virt-builder \ "$distro" \ -o "/opt/qemu/$distro.qcow2" \ --format qcow2 \ --root-password password:root \ --run "$TEMP_SCRIPT" \ - --verbose + --verbose \ + $EXTRA_ARGS if [ -z "$KEEP_CACHE" ]; then virt-builder --delete-cache @@ -68,8 +78,8 @@ rm "$TEMP_SCRIPT" -# Marker for ansible main.yml to skipt the script -touch /opt/qemu/.qemu-create-vms-done-v1 +# Marker for ansible main.yml to skip the script +touch /opt/qemu/.qemu-create-vms-done-v2 echo echo "Done!" diff --git a/ansible/roles/qemu/tasks/main.yml b/ansible/roles/qemu/tasks/main.yml index c296f8f..96b3150 100644 --- a/ansible/roles/qemu/tasks/main.yml +++ b/ansible/roles/qemu/tasks/main.yml @@ -13,7 +13,7 @@ - name: run qemu-create-vms.sh ansible.builtin.script: qemu-create-vms.sh args: - creates: /opt/qemu/.qemu-create-vms-done-v1 + creates: /opt/qemu/.qemu-create-vms-done-v2 - name: add jenkins to the kvm group user: diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml index 5172091..eba2a79 100644 --- a/jobs/repo-install-test.yml +++ b/jobs/repo-install-test.yml @@ -10,6 +10,8 @@ feeds: !!python/tuple [nightly, latest] - debian11: feeds: !!python/tuple [nightly, latest] + - debian12: + feeds: !!python/tuple [nightly, latest] - job-template: name: Osmocom-repo-install-{distro} diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh index 676354a..246d5e5 100755 --- a/scripts/repo-install-test.sh +++ b/scripts/repo-install-test.sh @@ -16,6 +16,7 @@ centos8 debian10 debian11 + debian12 " IMG_DIR="/opt/qemu" TEST_DIR="scripts/repo-install-test" @@ -51,6 +52,9 @@ debian11) ret="$IMG_DIR/debian-11.qcow2" ;; + debian12) + ret="$IMG_DIR/debian-12.qcow2" + ;; *) set +x echo "ERROR: script error, missing img path for $DISTRO" >&2 diff --git a/scripts/repo-install-test/blacklist_debian12.txt b/scripts/repo-install-test/blacklist_debian12.txt new file mode 100644 index 0000000..4c9dbde --- /dev/null +++ b/scripts/repo-install-test/blacklist_debian12.txt @@ -0,0 +1,72 @@ +# These packages will not get explicitly installed in this test. +# Package lines must have nothing but the package (no comment, +# no additional space etc). + +# OpenBSC +# This is legacy, we aren't really interested in testing openbsc.git +# derived packages. Packages are found in openbsc/debian/control. +openbsc-dev +osmo-bsc-mgcp +osmo-bsc-mgcp-dbg +osmocom-bs11-utils +osmocom-bs11-utils-dbg +osmocom-bsc-nat +osmocom-bsc-nat-dbg +osmocom-bsc-sccplite +osmocom-bsc-sccplite-dbg +osmocom-ipaccess-utils +osmocom-ipaccess-utils-dbg +osmocom-nitb +osmocom-nitb-dbg + +# Causing conflicts, not relevant for the test +liblimesuite20.10-1-dbgsym +liblimesuite22.09-1-dbgsym +liborcania1.2 +liborcania1.2-dbgsym +liborcania2.1 +liborcania2.1-dbgsym +libulfius2.5 +libulfius2.5-dbgsym +libulfius2.7 +libulfius2.7-dbgsym +libyder2.0-dbgsym +limesuite-dbgsym +soapysdr0.7-module-lms7 +soapysdr0.7-module-lms7-dbgsym + +# Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which we won't install +librtlsdr0-dbgsym +rtl-sdr-dbgsym + +# Depends on mongodb, which was droppend from debian 10 onwards +open5gs +open5gs-amf +open5gs-amf-dbgsym +open5gs-ausf +open5gs-ausf-dbgsym +open5gs-common +open5gs-common-dbgsym +open5gs-dbg +open5gs-hss +open5gs-hss-dbgsym +open5gs-mme +open5gs-mme-dbgsym +open5gs-nrf +open5gs-nrf-dbgsym +open5gs-pcf +open5gs-pcf-dbgsym +open5gs-pcrf +open5gs-pcrf-dbgsym +open5gs-sgwc +open5gs-sgwc-dbgsym +open5gs-sgwu +open5gs-sgwu-dbgsym +open5gs-smf +open5gs-smf-dbgsym +open5gs-udm +open5gs-udm-dbgsym +open5gs-udr +open5gs-udr-dbgsym +open5gs-upf +open5gs-upf-dbgsym diff --git a/scripts/repo-install-test/run-inside.sh b/scripts/repo-install-test/run-inside.sh index 319e822..b45d76d 100755 --- a/scripts/repo-install-test/run-inside.sh +++ b/scripts/repo-install-test/run-inside.sh @@ -54,6 +54,9 @@ debian11) echo "Debian_11" ;; + debian12) + echo "Debian_12" + ;; *) echo "ERROR: unknown obsdir for '$DISTRO'." >&2 exit 1 @@ -256,7 +259,7 @@ "Depends: osmocom-" \ "but it is not going to be installed" ;; - debian11) + debian11|debian12) find_patterns_or_exit \ /tmp/out \ "Conflicts: osmocom-" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51fa3c5212b5e29f4c2804384781693e8de2c097 Gerrit-Change-Number: 34037 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[M] Change in osmo-ci[master]: repo-install-test: add debian12

by osmith

Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34037 ) Change subject: repo-install-test: add debian12 ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51fa3c5212b5e29f4c2804384781693e8de2c097 Gerrit-Change-Number: 34037 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Aug 2023 09:29:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: use debian-bookworm-titan

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34051 ) Change subject: jobs/gerrit-verifications: use debian-bookworm-titan ...................................................................... jobs/gerrit-verifications: use debian-bookworm-titan Related: OS#6057 Change-Id: Ifd7fc7a2360fc64be78c6a06f42d0f4d46af01a0 --- M jobs/gerrit-verifications.yml 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/51/34051/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index c4e9e34..f6c91fb 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -418,7 +418,7 @@ docker run \ --rm \ -v "$PWD:/build" \ - "registry.osmocom.org/osmocom-build/debian-bullseye-titan" \ + "registry.osmocom.org/osmocom-build/debian-bookworm-titan" \ {timeout_cmd} \ sh -e -x -c " useradd --uid=1000 build; -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifd7fc7a2360fc64be78c6a06f42d0f4d46af01a0 Gerrit-Change-Number: 34051 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-ci[master]: scripts/manuals/publish-manuals-for-tags: use bookworm

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34052 ) Change subject: scripts/manuals/publish-manuals-for-tags: use bookworm ...................................................................... scripts/manuals/publish-manuals-for-tags: use bookworm Related: OS#6057 Change-Id: Ifa56e7f035fde5fb750376c64572277de2417d65 --- M scripts/manuals/publish-manuals-for-tags.sh 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/52/34052/1 diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index 49a3d43..3f95ce7 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -4,7 +4,7 @@ TEMP="$OSMO_CI_DIR/_temp_manuals" 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-bullseye-jenkins" +DOCKER_IMAGE="$USER/debian-bookworm-build" LOG_PREFIX="::" # Releases that were made before shared osmo-gsm-manuals, or where build fails -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifa56e7f035fde5fb750376c64572277de2417d65 Gerrit-Change-Number: 34052 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-ci[master]: jobs/registry-rebuild-upload-titan: use bookworm

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34050 ) Change subject: jobs/registry-rebuild-upload-titan: use bookworm ...................................................................... jobs/registry-rebuild-upload-titan: use bookworm Related: OS#6057 Depends: docker-playground I4415fcde6518bd26d1e2cb5785ddaf84ac2116b3 Change-Id: Ibc25a62c2d3a2f6cd3e8136311ce2b37688c71a7 --- M jobs/registry-rebuild-upload-titan.yml 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/50/34050/1 diff --git a/jobs/registry-rebuild-upload-titan.yml b/jobs/registry-rebuild-upload-titan.yml index 84f8076..a535920 100644 --- a/jobs/registry-rebuild-upload-titan.yml +++ b/jobs/registry-rebuild-upload-titan.yml @@ -17,7 +17,7 @@ - job: name: registry-rebuild-upload-titan description: | - Rebuild + push ttcn3 base images (debian-bullseye-titan) in our private + Rebuild + push ttcn3 base images (debian-bookworm-titan) in our private registry.osmocom.org <br><br> Related:<br> @@ -34,8 +34,8 @@ builders: - shell: | REGISTRY="registry.osmocom.org" - make -C debian-bullseye-titan REGISTRY_HOST=$REGISTRY - docker push "$REGISTRY/$USER/debian-bullseye-titan" + make -C debian-bookworm-titan REGISTRY_HOST=$REGISTRY + docker push "$REGISTRY/$USER/debian-bookworm-titan" publishers: - email: notify-every-unstable-build: true -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibc25a62c2d3a2f6cd3e8136311ce2b37688c71a7 Gerrit-Change-Number: 34050 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-ci[master]: jobs/registry-update-base-images: add bookworm

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34054 ) Change subject: jobs/registry-update-base-images: add bookworm ...................................................................... jobs/registry-update-base-images: add bookworm Related: OS#6057 Change-Id: I55ff43f1764dd5f7de46360264e0afbb4659910f --- M jobs/registry-update-base-images.yml 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/54/34054/1 diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index 3dec830..6c4074e 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -23,6 +23,7 @@ IMAGES=" debian:buster debian:bullseye + debian:bookworm debian:sid centos:centos7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I55ff43f1764dd5f7de46360264e0afbb4659910f Gerrit-Change-Number: 34054 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-ci[master]: scripts/osmo-ci-docker-rebuild: drop debian-bullseye-jenkins

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34053 ) Change subject: scripts/osmo-ci-docker-rebuild: drop debian-bullseye-jenkins ...................................................................... scripts/osmo-ci-docker-rebuild: drop debian-bullseye-jenkins It is not used anymore, stop building it. Related: OS#6057 Change-Id: I8e11e4c87fea9a2cfc5e72f0427cf4ca82030554 --- M scripts/osmo-ci-docker-rebuild.sh 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/53/34053/1 diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 08b7cf1..c9e2b63 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -5,11 +5,9 @@ case "$(arch)" in x86_64) - # debian-bullseye-jenkins: has python2 (OS#5950) docker_images_require \ "debian-bookworm-build" \ - "debian-bookworm-erlang" \ - "debian-bullseye-jenkins" + "debian-bookworm-erlang" ;; arm*) docker_images_require \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8e11e4c87fea9a2cfc5e72f0427cf4ca82030554 Gerrit-Change-Number: 34053 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in docker-playground[master]: debian-bookworm-build{,-arm}: fix temp dir removal

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34047 ) Change subject: debian-bookworm-build{,-arm}: fix temp dir removal ...................................................................... debian-bookworm-build{,-arm}: fix temp dir removal Change-Id: I6a0e0869986550ddfa710dfc15d7e78d8974dbc5 --- M debian-bookworm-build-arm/Dockerfile M debian-bookworm-build/Dockerfile 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/47/34047/1 diff --git a/debian-bookworm-build-arm/Dockerfile b/debian-bookworm-build-arm/Dockerfile index 9a4b2b4..ac07ae7 100644 --- a/debian-bookworm-build-arm/Dockerfile +++ b/debian-bookworm-build-arm/Dockerfile @@ -66,6 +66,7 @@ git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ cd osmo-python-tests && \ python3 setup.py clean build install && \ + cd .. && \ rm -rf osmo-python-tests # Install osmo-ci.git/scripts to /usr/local/bin diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile index f717241..f019bd0 100644 --- a/debian-bookworm-build/Dockerfile +++ b/debian-bookworm-build/Dockerfile @@ -186,6 +186,7 @@ git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ cd osmo-python-tests && \ python3 setup.py clean build install && \ + cd .. && \ rm -rf osmo-python-tests # Install osmo-ci.git/scripts to /usr/local/bin -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6a0e0869986550ddfa710dfc15d7e78d8974dbc5 Gerrit-Change-Number: 34047 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in docker-playground[master]: ttcn3: use debian-bookworm-titan

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34049 ) Change subject: ttcn3: use debian-bookworm-titan ...................................................................... ttcn3: use debian-bookworm-titan Related: OS#6057 Change-Id: I2017dd3888670c475b96e692d911a433484f3df9 --- M jenkins-common.sh M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M ttcn3-bsc-test-vamos/Dockerfile M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-cbc-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-hnbgw-test/Dockerfile M ttcn3-hnodeb-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-mme-test-ogs/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-ns-test/Dockerfile M ttcn3-pcap-client-test/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-pgw-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile M ttcn3-upf-test/Dockerfile 29 files changed, 40 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/49/34049/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index f91c615..f069ffc 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -23,7 +23,7 @@ osmo-*-latest) echo "debian-$DEBIAN_DEFAULT-obs-latest" ;; osmo-*) echo "debian-$DEBIAN_DEFAULT-build" ;; open5gs-master) echo "debian-$DEBIAN_DEFAULT-build" ;; - ttcn3-*) echo "debian-bullseye-titan" ;; + ttcn3-*) echo "debian-bookworm-titan" ;; esac } @@ -147,7 +147,7 @@ # they are up-to-date. if [ "$REGISTRY_HOST" = "registry.osmocom.org" ]; then case "$i" in - debian-bullseye-titan) + debian-bookworm-titan) docker pull "$REGISTRY_HOST/$USER/$i" continue ;; diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index 1b71671..3db8745 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -6,7 +6,7 @@ "debian-buster-build" \ "sigtran-tests" \ "osmo-stp-$IMAGE_SUFFIX" \ - "debian-bullseye-titan" \ + "debian-bookworm-titan" \ "nplab-m3ua-test" set_clean_up_trap diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh index 6ee52ee..a9fbadf 100755 --- a/nplab-sua-test/jenkins.sh +++ b/nplab-sua-test/jenkins.sh @@ -5,7 +5,7 @@ docker_images_require \ "debian-buster-build" \ "osmo-stp-$IMAGE_SUFFIX" \ - "debian-bullseye-titan" \ + "debian-bookworm-titan" \ "sigtran-tests" \ "nplab-sua-test" diff --git a/ttcn3-bsc-test-vamos/Dockerfile b/ttcn3-bsc-test-vamos/Dockerfile index eac8f46..963c8de 100644 --- a/ttcn3-bsc-test-vamos/Dockerfile +++ b/ttcn3-bsc-test-vamos/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index eac8f46..963c8de 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 07377c8..6748975 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 386ac3b..e99a7c6 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-cbc-test/Dockerfile b/ttcn3-cbc-test/Dockerfile index 4048f20..784eb25 100644 --- a/ttcn3-cbc-test/Dockerfile +++ b/ttcn3-cbc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index f237e8b..961eeef 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index c215d62..1026180 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 36778c9..447ddeb 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index e8b80a8..df3396d 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-hnbgw-test/Dockerfile b/ttcn3-hnbgw-test/Dockerfile index c37e1bf..3b4e930 100644 --- a/ttcn3-hnbgw-test/Dockerfile +++ b/ttcn3-hnbgw-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-hnodeb-test/Dockerfile b/ttcn3-hnodeb-test/Dockerfile index 6783abd..df6cb94 100644 --- a/ttcn3-hnodeb-test/Dockerfile +++ b/ttcn3-hnodeb-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index bfc0b9e..e8aad68 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-mme-test-ogs/Dockerfile b/ttcn3-mme-test-ogs/Dockerfile index 048a8e8..0f9d688 100644 --- a/ttcn3-mme-test-ogs/Dockerfile +++ b/ttcn3-mme-test-ogs/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan RUN apt-get update && \ apt-get upgrade -y && \ diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 9bcd891..6fe48d4 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 12ebee4..1c31513 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-ns-test/Dockerfile b/ttcn3-ns-test/Dockerfile index d39f493..aa10337 100644 --- a/ttcn3-ns-test/Dockerfile +++ b/ttcn3-ns-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-pcap-client-test/Dockerfile b/ttcn3-pcap-client-test/Dockerfile index 10c829b..7cfd940 100644 --- a/ttcn3-pcap-client-test/Dockerfile +++ b/ttcn3-pcap-client-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index e97ac40..9ed8690 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-pgw-test/Dockerfile b/ttcn3-pgw-test/Dockerfile index 5233c5e..5e53902 100644 --- a/ttcn3-pgw-test/Dockerfile +++ b/ttcn3-pgw-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index b902e2d..650c07c 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index 68fd2c0..8d52787 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index da67044..eba4ddd 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 53d70db..7418ea6 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index f5dd890..6c41c1c 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 256132d..995ef53 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-upf-test/Dockerfile b/ttcn3-upf-test/Dockerfile index c0e3d6c..665d818 100644 --- a/ttcn3-upf-test/Dockerfile +++ b/ttcn3-upf-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2017dd3888670c475b96e692d911a433484f3df9 Gerrit-Change-Number: 34049 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in docker-playground[master]: debian-bookworm-titan{,-master}: new containers

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34048 ) Change subject: debian-bookworm-titan{,-master}: new containers ...................................................................... debian-bookworm-titan{,-master}: new containers Add new containers based on debian-bookworm. Make some improvements over the bullseye containers while at it: * Remove sed for cversion.h, as the #error it is trying to replace is a warning now so it is a no-op, and we use our own eclipse-titan package instead of debian's package. * Make apt commands consistent * Move commands around to make better use of the cache * Clone osmo-python-tests from gerrit instead of gitea and invalidate cache when master changes * Tweak comments Related: OS#6057 Change-Id: I4415fcde6518bd26d1e2cb5785ddaf84ac2116b3 --- A debian-bookworm-titan-master/Dockerfile A debian-bookworm-titan-master/Makefile A debian-bookworm-titan/Dockerfile A debian-bookworm-titan/Makefile 4 files changed, 224 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/48/34048/1 diff --git a/debian-bookworm-titan-master/Dockerfile b/debian-bookworm-titan-master/Dockerfile new file mode 100644 index 0000000..2b0644a --- /dev/null +++ b/debian-bookworm-titan-master/Dockerfile @@ -0,0 +1,122 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/" + +# Copy from common dir +COPY .common/Release.key /usr/share/keyrings/osmocom-latest.asc +COPY .common/pipework /usr/local/bin/pipework +COPY .common/ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare +COPY .common/ttcn3-docker-run.sh /usr/local/bin/ttcn3-docker-run + +# Install packages from Debian repositories (alphabetic order) +ENV DEBIAN_FRONTEND=noninteractive +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + build-essential \ + ca-certificates \ + git \ + iputils-ping \ + netcat-openbsd \ + procps \ + python3-setuptools \ + tcpdump \ + vim \ + wget \ + wireshark-common \ + && \ + apt-get clean + +# Binary-only transcoding library for RANAP/RUA/HNBAP to work around TITAN only implementing BER +RUN set -x && \ + export DPKG_ARCH="$(dpkg --print-architecture)" && \ + wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.5_${DPKG_… && \ + wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.5_${DP… && \ + dpkg -i ./libfftranscode0_0.5_${DPKG_ARCH}.deb ./libfftranscode-dev_0.5_${DPKG_ARCH}.deb && \ + apt install --fix-broken && \ + rm libfftranscode*.deb + +# Install osmo-python-tests (for obtaining talloc reports from SUT) +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ + cd osmo-python-tests && \ + python3 setup.py clean build install && \ + cd .. && \ + rm -rf osmo-python-tests + +# Configure git +RUN git config --global user.email docker(a)dock.er && \ + git config --global user.name "Dock Er" + +# +# Start of build + install titan from git +# (The rest is the same as debian-bookworm-titan) +# + +# Remember to adapt the URL fetching /root/titan.core-ver.json if TITAN_REPO_URL is changed! +ARG TITAN_REPO_URL=https://gitlab.eclipse.org/eclipse/titan/titan.core.git +ARG TITAN_BRANCH=master +ARG TITAN_REPO_DIR=titan.core + +# Install titan.core dependencies listed in debian/control +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + bison \ + debhelper \ + default-jdk \ + expect \ + flex \ + gcc \ + libedit-dev \ + libncurses5-dev \ + libpcap-dev \ + libpcre3-dev \ + libsctp-dev \ + libssl-dev \ + libxml2-dev \ + make \ + perl \ + python3 \ + && \ + apt-get clean + +# Clone and update the source code (if needed) +RUN git clone $TITAN_REPO_URL +ADD https://gitlab.eclipse.org/api/v4/projects/eclipse%2Ftitan%2Ftitan.core/rep… /root/titan.core-ver.json +RUN set -x && \ + cd $TITAN_REPO_DIR && \ + git fetch && git checkout -f -B $TITAN_BRANCH origin/$TITAN_BRANCH + +# Build + install titan.core onto /titan.core/Install +RUN set -x && \ + cd $TITAN_REPO_DIR && \ + make -j$(nproc) prefix=/usr install + +# Install files in proper places: +RUN set -x && \ + cd /$TITAN_REPO_DIR/Install && \ + cp -r bin/* /usr/bin/ && \ + mkdir -p /usr/share/titan/etc/ && cp -r etc/* /usr/share/titan/etc/ && \ + mkdir -p /usr/share/titan/help/ && cp -r help/* /usr/share/titan/help/ && \ + mkdir -p /usr/include/titan/ && cp -r include/* /usr/include/titan/ && \ + mkdir -p /usr/lib/titan/ && cp -r lib/* /usr/lib/titan/ + +# +# End of build + install titan from git +# + +# Clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) +RUN git clone https://gerrit.osmocom.org/osmo-ttcn3-hacks && \ + make -j8 -C /osmo-ttcn3-hacks deps +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/refs/heads/ma… /tmp/deps-Makefile +RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ + cd /osmo-ttcn3-hacks && \ + git pull && \ + make -j8 deps; \ + fi diff --git a/debian-bookworm-titan-master/Makefile b/debian-bookworm-titan-master/Makefile new file mode 100644 index 0000000..ff6c155 --- /dev/null +++ b/debian-bookworm-titan-master/Makefile @@ -0,0 +1,3 @@ +include ../make/Makefile +UPSTREAM_DISTRO=debian:bookworm +DISTRO=debian-bookworm diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile new file mode 100644 index 0000000..99a79c8 --- /dev/null +++ b/debian-bookworm-titan/Dockerfile @@ -0,0 +1,75 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/" + +# Copy from common dir +COPY .common/Release.key /usr/share/keyrings/osmocom-latest.asc +COPY .common/pipework /usr/local/bin/pipework +COPY .common/ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare +COPY .common/ttcn3-docker-run.sh /usr/local/bin/ttcn3-docker-run + +# Install packages from Debian repositories (alphabetic order) +ENV DEBIAN_FRONTEND=noninteractive +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + build-essential \ + ca-certificates \ + git \ + iputils-ping \ + netcat-openbsd \ + procps \ + python3-setuptools \ + tcpdump \ + vim \ + wget \ + wireshark-common \ + && \ + apt-get clean + +# Binary-only transcoding library for RANAP/RUA/HNBAP to work around TITAN only implementing BER +RUN set -x && \ + export DPKG_ARCH="$(dpkg --print-architecture)" && \ + wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.5_${DPKG_… && \ + wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.5_${DP… && \ + dpkg -i ./libfftranscode0_0.5_${DPKG_ARCH}.deb ./libfftranscode-dev_0.5_${DPKG_ARCH}.deb && \ + apt install --fix-broken && \ + rm libfftranscode*.deb + +# Install osmo-python-tests (for obtaining talloc reports from SUT) +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ + cd osmo-python-tests && \ + python3 setup.py clean build install && \ + cd .. && \ + rm -rf osmo-python-tests + +# Configure git +RUN git config --global user.email docker(a)dock.er && \ + git config --global user.name "Dock Er" + +# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes +RUN echo "deb [signed-by=/usr/share/keyrings/osmocom-latest.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-latest.list +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + eclipse-titan \ + && \ + apt-get clean + +# Clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) +RUN git clone https://gerrit.osmocom.org/osmo-ttcn3-hacks && \ + make -j8 -C /osmo-ttcn3-hacks deps +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/refs/heads/ma… /tmp/deps-Makefile +RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ + cd /osmo-ttcn3-hacks && \ + git pull && \ + make -j8 deps; \ + fi diff --git a/debian-bookworm-titan/Makefile b/debian-bookworm-titan/Makefile new file mode 100644 index 0000000..ff6c155 --- /dev/null +++ b/debian-bookworm-titan/Makefile @@ -0,0 +1,3 @@ +include ../make/Makefile +UPSTREAM_DISTRO=debian:bookworm +DISTRO=debian-bookworm -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4415fcde6518bd26d1e2cb5785ddaf84ac2116b3 Gerrit-Change-Number: 34048 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023