From e7ef10af2efa908acc4f0e29126dcbffd4f7a825 Mon Sep 17 00:00:00 2001
From: Peio Rigaux <peio.rigaux@belledonne-communications.com>
Date: Tue, 6 Feb 2024 11:50:42 +0100
Subject: [PATCH] Added Rocky9 Packaging for php-redis dependencies

---
 .gitlab-ci-files/deploy.yml  |  8 ++++++++
 .gitlab-ci-files/package.yml | 25 ++++++++++++++++++-------
 .gitlab-ci-files/test.yml    |  8 ++++++++
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci-files/deploy.yml b/.gitlab-ci-files/deploy.yml
index b6b277b..be5e3a2 100644
--- a/.gitlab-ci-files/deploy.yml
+++ b/.gitlab-ci-files/deploy.yml
@@ -38,6 +38,14 @@ remi-rocky8-deploy:
     - remi-rocky8-package
     - remi-rocky8-test
 
+remi-rocky9-deploy:
+  extends: .deploy
+  script:
+    - ./deploy_packages.sh rockylinux
+  needs:
+    - remi-rocky9-package
+    - remi-rocky9-test
+
 .deploy:
   stage: deploy
   tags: ["docker"]
diff --git a/.gitlab-ci-files/package.yml b/.gitlab-ci-files/package.yml
index a80d56a..e1632b8 100644
--- a/.gitlab-ci-files/package.yml
+++ b/.gitlab-ci-files/package.yml
@@ -25,23 +25,34 @@ debian12-package:
 
 remi-rocky8-package:
   image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION
+  extends: .remi-rocky-package
+  variables:
+    EL_VERSION: 8
+
+remi-rocky9-package:
+  image: gitlab.linphone.org:4567/bc/public/docker/rocky9-php:$ROCKY_9_IMAGE_VERSION
+  extends: .remi-rocky-package
+  variables:
+    EL_VERSION: 9
+
+.remi-rocky-package:
   extends: .package
   script:
     - mkdir -p $CI_PROJECT_DIR/build
-    - dnf -y install https://rpms.remirepo.net/enterprise/remi-release-8.rpm
+    - dnf -y install https://rpms.remirepo.net/enterprise/remi-release-$EL_VERSION.rpm
     - yum -y install wget php-devel gcc liblzf php-pear lz4-devel liblzf-devel libzstd-devel php-pecl-apcu-devel
     # igbinary
     - wget https://rpms.remirepo.net/SRPMS/$PHP_IGBINARY_REMI_VERSION.remi.src.rpm
     - rpmbuild --rebuild $PHP_IGBINARY_REMI_VERSION.remi.src.rpm
     - rm /root/rpmbuild/RPMS/*/*debug*.rpm
-    - mv /root/rpmbuild/RPMS/*/*devel*.rpm $CI_PROJECT_DIR/build/$PHP_IGBINARY_REMI_VERSION-devel.el8.x86_64.rpm || true # Rename to fit our naming format
-    - mv /root/rpmbuild/RPMS/*/*.rpm $CI_PROJECT_DIR/build/$PHP_IGBINARY_REMI_VERSION.el8.x86_64.rpm # Rename to fit our naming format
+    - mv /root/rpmbuild/RPMS/*/*devel*.rpm $CI_PROJECT_DIR/build/$PHP_IGBINARY_REMI_VERSION-devel.el$EL_VERSION.x86_64.rpm || true # Rename to fit our naming format
+    - mv /root/rpmbuild/RPMS/*/*.rpm $CI_PROJECT_DIR/build/$PHP_IGBINARY_REMI_VERSION.el$EL_VERSION.x86_64.rpm # Rename to fit our naming format
     # msgpack
     - wget https://rpms.remirepo.net/SRPMS/$PHP_MSGPACK_REMI_VERSION.remi.src.rpm
     - rpmbuild --rebuild $PHP_MSGPACK_REMI_VERSION.remi.src.rpm
     - rm /root/rpmbuild/RPMS/*/*debug*.rpm
-    - mv /root/rpmbuild/RPMS/*/*devel*.rpm $CI_PROJECT_DIR/build/$PHP_MSGPACK_REMI_VERSION-devel.el8.x86_64.rpm || true
-    - mv /root/rpmbuild/RPMS/*/*.rpm $CI_PROJECT_DIR/build/$PHP_MSGPACK_REMI_VERSION.el8.x86_64.rpm
+    - mv /root/rpmbuild/RPMS/*/*devel*.rpm $CI_PROJECT_DIR/build/$PHP_MSGPACK_REMI_VERSION-devel.el$EL_VERSION.x86_64.rpm || true
+    - mv /root/rpmbuild/RPMS/*/*.rpm $CI_PROJECT_DIR/build/$PHP_MSGPACK_REMI_VERSION.el$EL_VERSION.x86_64.rpm
     # install and cleanup the dependencies
     - yum -y localinstall build/*.rpm
     - rm build/*.rpm
@@ -49,8 +60,8 @@ remi-rocky8-package:
     - wget https://rpms.remirepo.net/SRPMS/$PHP_REDIS_REMI_VERSION.remi.src.rpm
     - rpmbuild --rebuild $PHP_REDIS_REMI_VERSION.remi.src.rpm
     - rm /root/rpmbuild/RPMS/*/*debug*.rpm
-    - mv /root/rpmbuild/RPMS/*/*devel*.rpm $CI_PROJECT_DIR/build/$PHP_REDIS_REMI_VERSION-devel.el8.x86_64.rpm || true
-    - mv /root/rpmbuild/RPMS/*/*.rpm $CI_PROJECT_DIR/build/$PHP_REDIS_REMI_VERSION.el8.x86_64.rpm
+    - mv /root/rpmbuild/RPMS/*/*devel*.rpm $CI_PROJECT_DIR/build/$PHP_REDIS_REMI_VERSION-devel.el$EL_VERSION.x86_64.rpm || true
+    - mv /root/rpmbuild/RPMS/*/*.rpm $CI_PROJECT_DIR/build/$PHP_REDIS_REMI_VERSION.el$EL_VERSION.x86_64.rpm
 
     - rm -r /root/rpmbuild # Cleanup
 
diff --git a/.gitlab-ci-files/test.yml b/.gitlab-ci-files/test.yml
index 66642be..b2005db 100644
--- a/.gitlab-ci-files/test.yml
+++ b/.gitlab-ci-files/test.yml
@@ -53,6 +53,14 @@ remi-rocky8-test:
   script:
     - yum -y localinstall build/*.rpm
 
+remi-rocky9-test:
+  extends: .test
+  image: gitlab.linphone.org:4567/bc/public/docker/rocky9-php:$ROCKY_9_IMAGE_VERSION
+  needs:
+    - remi-rocky9-package
+  script:
+    - yum -y localinstall build/*.rpm
+
 mysql-latest-test:
   extends: .test
   image: gitlab.linphone.org:4567/bc/public/docker/debian12-php:$DEBIAN_12_IMAGE_VERSION