From ff4e704bfa4fe77f24cc4cbc56c8cab280cbafa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Thu, 19 Oct 2023 11:40:06 +0200
Subject: [PATCH] Build and package all the Remi packages in one go

---
 .gitlab-ci-files/deploy.yml  |  4 +--
 .gitlab-ci-files/package.yml | 49 +++++++++++++++++-------------------
 .gitlab-ci-files/test.yml    |  2 +-
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/.gitlab-ci-files/deploy.yml b/.gitlab-ci-files/deploy.yml
index 426e9cb..f40bba2 100644
--- a/.gitlab-ci-files/deploy.yml
+++ b/.gitlab-ci-files/deploy.yml
@@ -27,9 +27,7 @@ remi-deploy:
   script:
     - ./deploy_packages.sh rockylinux
   needs:
-    - remi-phpredis-package
-    - remi-igbinary-package
-    - remi-msgpack-package
+    - remi-package
     - remi-phpredis-test
 
 .deploy:
diff --git a/.gitlab-ci-files/package.yml b/.gitlab-ci-files/package.yml
index 1c63eb2..8b02bf3 100644
--- a/.gitlab-ci-files/package.yml
+++ b/.gitlab-ci-files/package.yml
@@ -17,38 +17,35 @@ 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:
-    - yum -y localinstall build/*.rpm
-  needs:
-    - remi-igbinary-package
-    - remi-msgpack-package
-  variables:
-    PACKAGE: $PHP_REDIS_REMI_VERSION
-
-remi-igbinary-package:
-  extends: .remi-package
-  variables:
-    PACKAGE: $PHP_IGBINARY_REMI_VERSION
-
-remi-msgpack-package:
-  extends: .remi-package
-  variables:
-    PACKAGE: $PHP_MSGPACK_REMI_VERSION
-
-.remi-package:
+remi-package:
   extends: .package
   image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION
   script:
     - mkdir -p $CI_PROJECT_DIR/build
     - dnf -y install https://rpms.remirepo.net/enterprise/remi-release-8.rpm
     - yum -y install wget php-devel gcc liblzf php-pear lz4-devel liblzf-devel libzstd-devel php-pecl-apcu-devel
-    - wget https://rpms.remirepo.net/SRPMS/$PACKAGE.remi.src.rpm
-    - rpmbuild --rebuild $PACKAGE.remi.src.rpm
-    - rm -f /root/rpmbuild/RPMS/*/*debug*.rpm
-    - mv /root/rpmbuild/RPMS/*/*devel*.rpm $CI_PROJECT_DIR/build/$PACKAGE-devel.el8.x86_64.rpm || true # Rename to fit our naming format
-    - mv /root/rpmbuild/RPMS/*/*.rpm $CI_PROJECT_DIR/build/$PACKAGE.el8.x86_64.rpm # Rename to fit our naming format
+    # 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
+    # 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
+    # install and cleanup the dependencies
+    - yum -y localinstall build/*.rpm
+    - rm build/*.rpm
+    # phpredis
+    - 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
+
     - rm -r /root/rpmbuild # Cleanup
 
 .package:
diff --git a/.gitlab-ci-files/test.yml b/.gitlab-ci-files/test.yml
index 5a6b9b1..f5e9dd7 100644
--- a/.gitlab-ci-files/test.yml
+++ b/.gitlab-ci-files/test.yml
@@ -41,7 +41,7 @@ remi-phpredis-test:
   extends: .test
   image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION
   needs:
-    - remi-phpredis-package
+    - remi-package
   script:
     - yum -y localinstall build/*.rpm