osmith has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/33743 )
Change subject: jenkins-common: add + set default: debian bookworm
......................................................................
jenkins-common: add + set default: debian bookworm
Related: OS#6057
Change-Id: I37e5393398f17c5c8809e17bb363fa86d769f2c2
---
M jenkins-common.sh
1 file changed, 22 insertions(+), 6 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/jenkins-common.sh b/jenkins-common.sh
index e70c217..20c1c4e 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -1,5 +1,6 @@
CACHE_DIR="$(realpath ../_cache)"
KERNEL_TEST_DIR="$(realpath ../scripts/kernel-test)"
+DEBIAN_DEFAULT="bookworm"
docker_image_exists() {
test -n "$(docker images -q "$REPO_USER/$1")"
@@ -19,9 +20,9 @@
osmo-*-latest-centos8) echo "centos8-obs-latest" ;;
osmo-*-centos7) echo "centos7-build" ;;
osmo-*-centos8) echo "centos8-build" ;;
- osmo-*-latest) echo "debian-bullseye-obs-latest" ;;
- osmo-*) echo "debian-bullseye-build" ;;
- open5gs-master) echo "debian-bullseye-build" ;;
+ 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" ;;
esac
}
@@ -33,7 +34,9 @@
centos7-*) echo "centos7" ;;
centos8-*) echo "centos8" ;;
debian-buster-*) echo "debian-buster" ;;
- *) echo "debian-bullseye" ;;
+ debian-bullseye-*) echo "debian-bullseye" ;;
+ debian-bookworm-*) echo "debian-bookworm" ;;
+ *) echo "debian-$DEBIAN_DEFAULT" ;;
esac
}
@@ -46,9 +49,12 @@
debian9-*) echo "debian:stretch" ;;
debian10-*) echo "debian:buster" ;;
debian11-*) echo "debian:bullseye" ;;
+ debian12-*) echo "debian:bookworm" ;;
debian-stretch-*) echo "debian:stretch" ;;
debian-buster-*) echo "debian:buster" ;;
- *) echo "debian:bullseye" ;;
+ debian-bullseye-*) echo "debian:bullseye" ;;
+ debian-bookworm-*) echo "debian:bookworm" ;;
+ *) echo "debian:$DEBIAN_DEFAULT" ;;
esac
}
@@ -354,7 +360,7 @@
-v $VOL_BASE_DIR:/data \
-v $CACHE_DIR:/cache \
--name ${BUILD_TAG}-cleaner \
- debian:bullseye \
+ "debian:$DEBIAN_DEFAULT" \
chmod -R a+rX /data/ /cache/
}
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33743
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I37e5393398f17c5c8809e17bb363fa86d769f2c2
Gerrit-Change-Number: 33743
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
