From 2305161fe7f729a4c4715cd1f00ae72c3cb8aaa5 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 2 Jan 2023 14:32:49 +0100
Subject: [PATCH] Fixing gitlab/deploy-packages.yaml

---
 gitlab/deploy-packages.yaml | 45 ++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/gitlab/deploy-packages.yaml b/gitlab/deploy-packages.yaml
index 9e9a293..b24815f 100644
--- a/gitlab/deploy-packages.yaml
+++ b/gitlab/deploy-packages.yaml
@@ -102,41 +102,34 @@ Deploy packages:
     - echo "Packages to deploy:"; find rpmdir/*RPMS -type f -print0 | xargs --null --no-run-if-empty ls -l -d --color=always
     - |
       for el_version in 7 8 9 ; do
-          echo
+          echo ' '
           echo "Deploying packages for EL version ${el_version} ..."
-          # if [[ -z "$CI_COMMIT_TAG" ]] ; then
-          #     continue
-          # fi
-          echo
+          if [[ -z "$CI_COMMIT_TAG" ]] ; then
+              echo "Deploy will not be done, not a tag."
+              continue
+          fi
+          echo ' '
           src_repo_dir="${YUM_REPO_DIR}/${el_version}-src"
           echo "Ensuring existence of ${YUM_REPO_HOST}:${src_repo_dir}/ ..."
-          if [[ -n "$CI_COMMIT_TAG" || 1 == 1 ]] ; then
-              echo "ssh -o StrictHostKeyChecking=no \"${YUM_REPO_USER}@${YUM_REPO_HOST}\" \"if [ ! -d ${src_repo_dir} ] ; then mkdir -pv ${src_repo_dir} ; fi\""
-              # ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "if [ ! -d ${src_repo_dir} ] ; then mkdir -pv ${src_repo_dir} ; fi"
-          fi
+          echo "ssh -o StrictHostKeyChecking=no \"${YUM_REPO_USER}@${YUM_REPO_HOST}\" \"if [ ! -d ${src_repo_dir} ] ; then mkdir -pv ${src_repo_dir} ; fi\""
+          ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "if [ ! -d ${src_repo_dir} ] ; then mkdir -pv ${src_repo_dir} ; fi"
           echo "Deploying source packages to ${YUM_REPO_HOST}:${src_repo_dir}/ ..."
           ls -l --color=auto rpmdir/SRPMS/*.el${el_version}.*.rpm
-          if [[ -n "$CI_COMMIT_TAG" || 1 == 1 ]] ; then
-              echo "scp -p -o StrictHostKeyChecking=no rpmdir/SRPMS/*.el${el_version}.*.rpm \"${YUM_REPO_USER}@${YUM_REPO_HOST}:${src_repo_dir}/\""
-              # scp -p -o StrictHostKeyChecking=no rpmdir/SRPMS/*.el${el_version}.*.rpm "${YUM_REPO_USER}@${YUM_REPO_HOST}:${src_repo_dir}/"
-              echo "ssh -o StrictHostKeyChecking=no \"${YUM_REPO_USER}@${YUM_REPO_HOST}\" \"cd ${src_repo_dir}/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata\""
-              # ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "cd ${src_repo_dir}/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata"
-          fi
-          echo
+          echo "scp -p -o StrictHostKeyChecking=no rpmdir/SRPMS/*.el${el_version}.*.rpm \"${YUM_REPO_USER}@${YUM_REPO_HOST}:${src_repo_dir}/\""
+          scp -p -o StrictHostKeyChecking=no rpmdir/SRPMS/*.el${el_version}.*.rpm "${YUM_REPO_USER}@${YUM_REPO_HOST}:${src_repo_dir}/"
+          echo "ssh -o StrictHostKeyChecking=no \"${YUM_REPO_USER}@${YUM_REPO_HOST}\" \"cd ${src_repo_dir}/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata\""
+          ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "cd ${src_repo_dir}/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata"
+          echo ' '
           bin_repo_dir="${YUM_REPO_DIR}/${el_version}"
           echo "Ensuring existence of ${YUM_REPO_HOST}:${bin_repo_dir}/ ..."
-          if [[ -n "$CI_COMMIT_TAG" || 1 == 1 ]] ; then
-              echo "ssh -o StrictHostKeyChecking=no \"${YUM_REPO_USER}@${YUM_REPO_HOST}\" \"if [ ! -d ${bin_repo_dir} ] ; then mkdir -pv ${bin_repo_dir} ; fi\""
-              # ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "if [ ! -d ${bin_repo_dir} ] ; then mkdir -pv ${bin_repo_dir} ; fi"
-          fi
+          echo "ssh -o StrictHostKeyChecking=no \"${YUM_REPO_USER}@${YUM_REPO_HOST}\" \"if [ ! -d ${bin_repo_dir} ] ; then mkdir -pv ${bin_repo_dir} ; fi\""
+          ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "if [ ! -d ${bin_repo_dir} ] ; then mkdir -pv ${bin_repo_dir} ; fi"
           echo "Deploying binary packages to ${YUM_REPO_HOST}:${bin_repo_dir}/ ..."
           ls -l --color=auto rpmdir/RPMS/*/*.el${el_version}.*.rpm
-          if [[ -n "$CI_COMMIT_TAG" || 1 == 1 ]] ; then
-              echo "scp -p -o StrictHostKeyChecking=no rpmdir/RPMS/*/*.el${el_version}.*.rpm \"${YUM_REPO_USER}@${YUM_REPO_HOST}:${bin_repo_dir}/\""
-              # scp -p -o StrictHostKeyChecking=no rpmdir/RPMS/*/*.el${el_version}.*.rpm "${YUM_REPO_USER}@${YUM_REPO_HOST}:${bin_repo_dir}/"
-              echo "ssh -o StrictHostKeyChecking=no \"${YUM_REPO_USER}@${YUM_REPO_HOST}\" \"cd ${bin_repo_dir}/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata\""
-              # ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "cd ${bin_repo_dir}/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata"
-          fi
+          echo "scp -p -o StrictHostKeyChecking=no rpmdir/RPMS/*/*.el${el_version}.*.rpm \"${YUM_REPO_USER}@${YUM_REPO_HOST}:${bin_repo_dir}/\""
+          scp -p -o StrictHostKeyChecking=no rpmdir/RPMS/*/*.el${el_version}.*.rpm "${YUM_REPO_USER}@${YUM_REPO_HOST}:${bin_repo_dir}/"
+          echo "ssh -o StrictHostKeyChecking=no \"${YUM_REPO_USER}@${YUM_REPO_HOST}\" \"cd ${bin_repo_dir}/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata\""
+          ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "cd ${bin_repo_dir}/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata"
           echo "Finished with EL version ${src_repo_dir}."
       done
   after_script:
-- 
2.39.5