From 7d9e0bc95ea705e22bac6ef99a21a5a06af6f08e Mon Sep 17 00:00:00 2001
From: Peio Rigaux <peio.rigaux@belledonne-communications.com>
Date: Mon, 25 Sep 2023 14:38:38 +0200
Subject: [PATCH] Added Debian 12 to CI

---
 .gitlab-ci-files/deploy.yml  |  8 ++++++++
 .gitlab-ci-files/package.yml | 13 ++++++++++---
 .gitlab-ci-files/test.yml    | 17 +++++++++++++----
 .gitlab-ci.yml               |  3 ++-
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci-files/deploy.yml b/.gitlab-ci-files/deploy.yml
index 6ded752..426e9cb 100644
--- a/.gitlab-ci-files/deploy.yml
+++ b/.gitlab-ci-files/deploy.yml
@@ -14,6 +14,14 @@ debian11-deploy:
     - debian11-package
     - debian11-test
 
+debian12-deploy:
+  extends: .deploy
+  script:
+    - ./deploy_packages.sh debian bookworm
+  needs:
+    - debian12-package
+    - debian12-test
+
 remi-deploy:
   extends: .deploy
   script:
diff --git a/.gitlab-ci-files/package.yml b/.gitlab-ci-files/package.yml
index abf8c18..1c63eb2 100644
--- a/.gitlab-ci-files/package.yml
+++ b/.gitlab-ci-files/package.yml
@@ -4,12 +4,19 @@ rocky8-package:
   script:
     - make rpm
 
-debian11-package:
+.debian_package:
   extends: .package
-  image: gitlab.linphone.org:4567/bc/public/docker/debian11-php:$DEBIAN_11_IMAGE_VERSION
   script:
     - make deb
 
+debian11-package:
+  extends: .debian_package
+  image: gitlab.linphone.org:4567/bc/public/docker/debian11-php:$DEBIAN_11_IMAGE_VERSION
+
+debian12-package:
+  extends: .debian_package
+  image: gitlab.linphone.org:4567/bc/public/docker/debian12-php:$DEBIAN_12_IMAGE_VERSION
+
 remi-phpredis-package:
   extends: .remi-package
   before_script:
@@ -56,4 +63,4 @@ remi-msgpack-package:
   cache:
     key: ${CI_COMMIT_REF_SLUG}
     paths:
-      - flexiapi/vendor/
\ No newline at end of file
+      - flexiapi/vendor/
diff --git a/.gitlab-ci-files/test.yml b/.gitlab-ci-files/test.yml
index 28add12..5a6b9b1 100644
--- a/.gitlab-ci-files/test.yml
+++ b/.gitlab-ci-files/test.yml
@@ -12,11 +12,8 @@ rocky8-test:
     - php artisan key:generate
     - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
 
-debian11-test:
+.debian-test:
   extends: .test
-  image: gitlab.linphone.org:4567/bc/public/docker/debian11-php:$DEBIAN_11_IMAGE_VERSION
-  needs:
-    - debian11-package
   script:
     - pwd
     - apt update
@@ -28,6 +25,18 @@ debian11-test:
     - php artisan key:generate
     - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
 
+debian11-test:
+  extends: .debian-test
+  image: gitlab.linphone.org:4567/bc/public/docker/debian11-php:$DEBIAN_11_IMAGE_VERSION
+  needs:
+    - debian11-package
+
+debian12-test:
+  extends: .debian-test
+  image: gitlab.linphone.org:4567/bc/public/docker/debian12-php:$DEBIAN_12_IMAGE_VERSION
+  needs:
+    - debian12-package
+
 remi-phpredis-test:
   extends: .test
   image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be1d1a2..9a691e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 variables:
   ROCKY_8_IMAGE_VERSION: 20230330_163028_remove_remi
   DEBIAN_11_IMAGE_VERSION: 20230322_172926_missing_tools
+  DEBIAN_12_IMAGE_VERSION: 20230925_143235_enable_debian12_packaging
   PHP_REDIS_REMI_VERSION: php-pecl-redis5-5.3.6-1
   PHP_IGBINARY_REMI_VERSION: php-pecl-igbinary-3.2.14-1
   PHP_MSGPACK_REMI_VERSION: php-pecl-msgpack-2.2.0-1
@@ -13,4 +14,4 @@ include:
 stages:
   - package
   - test
-  - deploy
\ No newline at end of file
+  - deploy