Merge branch 'feature/PB-24985-add-debian-bookworm' into 'main'

PB-24985: added debian bookworm See merge request passbolt/passbolt-ops/passbolt-dep-scripts!20
passbolt · Jun 15, 2023 · 510ed20 · 510ed20
2 parents 4546dfd + ea1403f
commit 510ed20
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/.gitlab-ci/test.yml b/.gitlab-ci/test.yml
@@ -49,14 +49,6 @@
   variables:
     PASSBOLT_FLAVOUR: "pro"
 
-Debian 10 CE:
-  extends: .test-deb-ce
-  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-buster-10:latest
-
-Debian 10 PRO:
-  extends: .test-deb-pro
-  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-buster-10:latest
-
 Debian 11 CE:
   extends: .test-deb-ce
   image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bullseye-11-slim:latest
@@ -65,6 +57,14 @@ Debian 11 PRO:
   extends: .test-deb-pro
   image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bullseye-11-slim:latest
 
+Debian 12 CE:
+  extends: .test-deb-ce
+  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bookworm-12:latest
+
+Debian 12 PRO:
+  extends: .test-deb-pro
+  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bookworm-12:latest
+
 Raspbian CE:
   extends: .test-deb-ce
   image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/debian-bullseye-11-slim:latest

diff --git a/passbolt-repo-setup.ce.sh b/passbolt-repo-setup.ce.sh
@@ -51,8 +51,8 @@ done
 
 function is_supported_distro() {
     local DISTROS=(
-            "debian10"
             "debian11"
+            "debian12"
             "raspbian"
             "ubuntu20"
             "ubuntu22"
@@ -131,6 +131,9 @@ os_detect () {
       fi
       # We use buster debian package for bullseye
       if [ "${CODENAME}" = "bullseye" ]
+      then
+          CODENAME="buster"
+      elif [ "${CODENAME}" = "bookworm" ]
       then
           CODENAME="buster"
       # We use focal ubuntu package for jammy

diff --git a/passbolt-repo-setup.pro.sh b/passbolt-repo-setup.pro.sh
@@ -51,8 +51,8 @@ done
 
 function is_supported_distro() {
     local DISTROS=(
-            "debian10"
             "debian11"
+            "debian12"
             "raspbian"
             "ubuntu20"
             "ubuntu22"
@@ -131,6 +131,9 @@ os_detect () {
       fi
       # We use buster debian package for bullseye
       if [ "${CODENAME}" = "bullseye" ]
+      then
+          CODENAME="buster"
+      elif [ "${CODENAME}" = "bookworm" ]
       then
           CODENAME="buster"
       # We use focal ubuntu package for jammy