From 8279d6744acd8827f09b0b2df4048c54cd6ef3f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Thu, 30 Mar 2023 16:48:08 +0200
Subject: [PATCH] Fix #87 Remove the remi repository from the pipeline

---
 .gitlab-ci-files/package.yml | 16 ++++++++++++++--
 .gitlab-ci-files/test.yml    |  1 +
 .gitlab-ci.yml               |  5 +++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci-files/package.yml b/.gitlab-ci-files/package.yml
index 91ba77b..8d3b177 100644
--- a/.gitlab-ci-files/package.yml
+++ b/.gitlab-ci-files/package.yml
@@ -12,6 +12,12 @@ debian11-package:
 
 remi-phpredis-package:
   extends: .remi-package
+  before_script:
+    - yum -y localinstall build/*.rpm
+  needs:
+    - remi-igbinary-package
+    - remi-msgpack-package
+    - remi-xmlrpc-package
   variables:
     PACKAGE: $PHP_REDIS_REMI_VERSION
 
@@ -25,16 +31,22 @@ remi-msgpack-package:
   variables:
     PACKAGE: $PHP_MSGPACK_REMI_VERSION
 
+remi-xmlrpc-package:
+  extends: .remi-package
+  variables:
+    PACKAGE: $PHP_XMLRPC_REMI_VERSION
+
 .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
-    - yum -y install wget php-devel gcc liblzf php-pear php-pecl-igbinary-devel php-pecl-msgpack-devel lz4-devel liblzf-devel libzstd-devel php-pecl-apcu-devel
+    - 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
-    - rm -f /root/rpmbuild/RPMS/*/*devel*.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
     - rm -r /root/rpmbuild # Cleanup
 
diff --git a/.gitlab-ci-files/test.yml b/.gitlab-ci-files/test.yml
index 28add12..9c1558d 100644
--- a/.gitlab-ci-files/test.yml
+++ b/.gitlab-ci-files/test.yml
@@ -3,6 +3,7 @@ rocky8-test:
   image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION
   needs:
     - rocky8-package
+    - remi-xmlrpc-package
   script:
     - yum -y localinstall build/*.rpm
     - cd /opt/belledonne-communications/share/flexisip-account-manager/flexiapi
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf7c2c1..4bdc37e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,10 @@
 variables:
-  ROCKY_8_IMAGE_VERSION: 20230323_113930_add_git
+  ROCKY_8_IMAGE_VERSION: 20230330_163028_remove_remi
   DEBIAN_11_IMAGE_VERSION: 20230322_172926_missing_tools
   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.1.2-1
+  PHP_XMLRPC_REMI_VERSION: php-pecl-xmlrpc-1.0.0~rc3-2
 
 include:
   - '.gitlab-ci-files/package.yml'
@@ -13,4 +14,4 @@ include:
 stages:
   - package
   - test
-  - deploy
+  - deploy
\ No newline at end of file