osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/42284?usp=email )
Change subject: repo-install-test: run for debian 13 too ......................................................................
repo-install-test: run for debian 13 too
This passes for latest, and should pass for nightly once this patch is merged: https://gerrit.osmocom.org/c/osmo-sgsn/+/42277
Change-Id: I1db9de8c740d5167e4813ece36f422b27aed5111 --- 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 M scripts/repo-install-test/run-inside.sh 5 files changed, 12 insertions(+), 2 deletions(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved
diff --git a/ansible/roles/qemu/files/qemu-create-vms.sh b/ansible/roles/qemu/files/qemu-create-vms.sh index a6ee8e7..16f9b4d 100755 --- a/ansible/roles/qemu/files/qemu-create-vms.sh +++ b/ansible/roles/qemu/files/qemu-create-vms.sh @@ -11,6 +11,7 @@ debian-10 debian-11 debian-12 + debian-13 " TEMP_SCRIPT="$(mktemp)"
@@ -79,7 +80,7 @@ rm "$TEMP_SCRIPT"
# Marker for ansible main.yml to skip the script -touch /opt/qemu/.qemu-create-vms-done-v2 +touch /opt/qemu/.qemu-create-vms-done-v3
echo echo "Done!" diff --git a/ansible/roles/qemu/tasks/main.yml b/ansible/roles/qemu/tasks/main.yml index 1678217..253f03f 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-v2 + creates: /opt/qemu/.qemu-create-vms-done-v3
- name: add jenkins to the kvm group user: diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml index 01ed548..d0bcd77 100644 --- a/jobs/repo-install-test.yml +++ b/jobs/repo-install-test.yml @@ -10,6 +10,8 @@ feeds: !!python/tuple [nightly, latest] - debian12: feeds: !!python/tuple [nightly, latest] + - debian13: + 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 27bb450..8289ecf 100755 --- a/scripts/repo-install-test.sh +++ b/scripts/repo-install-test.sh @@ -17,6 +17,7 @@ debian10 debian11 debian12 + debian13 " IMG_DIR="/opt/qemu" TEST_DIR="scripts/repo-install-test" @@ -55,6 +56,9 @@ debian12) ret="$IMG_DIR/debian-12.qcow2" ;; + debian13) + ret="$IMG_DIR/debian-13.qcow2" + ;; *) set +x echo "ERROR: script error, missing img path for $DISTRO" >&2 diff --git a/scripts/repo-install-test/run-inside.sh b/scripts/repo-install-test/run-inside.sh index 493c29f..5013fac 100755 --- a/scripts/repo-install-test/run-inside.sh +++ b/scripts/repo-install-test/run-inside.sh @@ -57,6 +57,9 @@ debian12) echo "Debian_12" ;; + debian13) + echo "Debian_13" + ;; *) echo "ERROR: unknown obsdir for '$DISTRO'." >&2 exit 1