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-"