From 595f669a35f41708687f6241e4e6d455a519b1a3 Mon Sep 17 00:00:00 2001
From: nqb <nqb+git@azyx.fr>
Date: Tue, 1 Jun 2021 11:10:35 +0200
Subject: [PATCH] [ci] upload packetfence-release for el7 and el8 with same
 GitLab jobs

---
 .gitlab-ci.yml                    | 14 ++++++--------
 ci/lib/upload/deploy-artifacts.sh | 26 ++++++++++++++------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbfd9681cd08..f082414a456c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -220,8 +220,6 @@ variables:
   variables:
     DEPLOY_USER: reposync
     DEPLOY_HOST: web.inverse.ca
-  environment:
-    name: ${PKG_DEST_NAME}
   script:
     - ./${UPLOAD_DIR}/deploy-artifacts.sh packetfence-release
   tags:
@@ -562,8 +560,8 @@ deploy_rpm_packetfence-release_devel:
   extends:
     - .deploy_rpm_packetfence-release_job
     - .job_devel_only_triggers
-  variables:
-    PKG_DEST_NAME: packetfence-release-el8.devel.noarch.rpm
+  environment:
+    name: devel
 
 deploy_rpm_branches:
   extends:
@@ -578,8 +576,8 @@ deploy_rpm_packetfence-release_branches:
   extends:
     - .deploy_rpm_packetfence-release_job
     - .job_branches_only_triggers
-  variables:
-    PKG_DEST_NAME: packetfence-release-el8.branches.noarch.rpm
+  environment:
+    name: branches
 
 deploy_rpm_release:
   extends:
@@ -595,8 +593,8 @@ deploy_rpm_packetfence-release_release:
   extends:
     - .deploy_rpm_packetfence-release_job
     - .job_release_triggers
-  variables:
-    PKG_DEST_NAME: packetfence-release-el8.stable.noarch.rpm
+  environment:
+    name: stable
 
 deploy_deb_devel:
   extends:
diff --git a/ci/lib/upload/deploy-artifacts.sh b/ci/lib/upload/deploy-artifacts.sh
index 98aaf605f1b8..f7ae3e7154ab 100755
--- a/ci/lib/upload/deploy-artifacts.sh
+++ b/ci/lib/upload/deploy-artifacts.sh
@@ -114,17 +114,19 @@ maint_deploy() {
 }
 
 # no deploy command because it's just a file
-packetfence_release_el8_deploy() {
-    src_dir="$RPM_RESULT_DIR/8"
-    dst_repo="$PUBLIC_REPO_BASE_DIR/RHEL8"
-    dst_dir="$DEPLOY_USER@$DEPLOY_HOST:$dst_repo"
-    pf_release_rpm_file=$(basename $(ls $src_dir/packetfence-release*))
-    pkg_dest_name=${PKG_DEST_NAME:-"packetfence-release-el8.${CI_COMMIT_REF_SLUG}.noarch.rpm"}
-    declare -p src_dir dst_dir pf_release_rpm_file pkg_dest_name
-
-    echo "scp: ${src_dir}/${pf_release_rpm_file} -> ${dst_dir}/${pkg_dest_name}"
-    scp "${src_dir}/${pf_release_rpm_file}" "${dst_dir}/${pkg_dest_name}" \
-        || die "scp failed"
+packetfence_release_deploy() {
+    for release_name in $(ls $RPM_RESULT_DIR); do
+        src_dir="$RPM_RESULT_DIR/${release_name}"
+        dst_repo="$PUBLIC_REPO_BASE_DIR/RHEL$release_name"
+        dst_dir="$DEPLOY_USER@$DEPLOY_HOST:$dst_repo"
+        pf_release_rpm_file=$(basename $(ls $src_dir/packetfence-release*))
+        pkg_dest_name=${PKG_DEST_NAME:-"packetfence-release-el${release_name}.${CI_ENV_NAME}.noarch.rpm"}
+        declare -p src_dir dst_dir pf_release_rpm_file pkg_dest_name
+
+        echo "scp: ${src_dir}/${pf_release_rpm_file} -> ${dst_dir}/${pkg_dest_name}"
+        scp "${src_dir}/${pf_release_rpm_file}" "${dst_dir}/${pkg_dest_name}" \
+            || die "scp failed"
+    done
 }
 
 log_section "Display artifacts"
@@ -138,6 +140,6 @@ case $1 in
     rpm) rpm_deploy ;;
     deb) deb_deploy ;;
     maintenance) maint_deploy ;;
-    packetfence-release) packetfence_release_el8_deploy ;;
+    packetfence-release) packetfence_release_deploy ;;
     *)   die "Wrong argument"
 esac