From 13aa772de30b04177bd5db530f5f8479f10bf7ff Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 2 Jan 2023 14:07:25 +0100
Subject: [PATCH] Output changes in gitlab/deploy-packages.yaml

---
 gitlab/deploy-packages.yaml | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/gitlab/deploy-packages.yaml b/gitlab/deploy-packages.yaml
index 8fe83dd..89bba76 100644
--- a/gitlab/deploy-packages.yaml
+++ b/gitlab/deploy-packages.yaml
@@ -103,31 +103,37 @@ Deploy packages:
     - |
       for el_version in 7 8 9 ; do
           echo
-          echo "Deploying packages for EL version ${src_repo_dir} ..."
-          if [[ -z "$CI_COMMIT_TAG" ]] ; then
-              continue
-          fi
+          echo "Deploying packages for EL version ${el_version} ..."
+          # if [[ -z "$CI_COMMIT_TAG" ]] ; then
+          #     continue
+          # fi
           echo
           src_repo_dir="${YUM_REPO_DIR}/${el_version}-src"
-          if [[ -n "$CI_COMMIT_TAG" ]] ; then
-              echo "Ensuring existence of ${YUM_REPO_HOST}:${src_repo_dir}/ ..."
+          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
-          if [[ -n "$CI_COMMIT_TAG" ]] ; then
-              echo "Deploying source packages to ${YUM_REPO_HOST}:${src_repo_dir}/ ..."
+          echo "Deploying source packages to ${YUM_REPO_HOST}:${src_repo_dir}/ ..."
+          if [[ -n "$CI_COMMIT_TAG" || 1 == 1 ]] ; then
+              echo "scp -p -o StrictHostKeyChecking=no rpmdir/SRPMS/*.${el_version}.*.rpm \"${YUM_REPO_USER}@${YUM_REPO_HOST}:${src_repo_dir}/\""
               # scp -p -o StrictHostKeyChecking=no rpmdir/SRPMS/*.${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
           bin_repo_dir="${YUM_REPO_DIR}/${el_version}"
-          if [[ -n "$CI_COMMIT_TAG" ]] ; then
-              echo "Ensuring existence of ${YUM_REPO_HOST}:${bin_repo_dir}/ ..."
+          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
-          if [[ -n "$CI_COMMIT_TAG" ]] ; then
-            echo "Deploying binary packages to ${YUM_REPO_HOST}:${bin_repo_dir}/ ..."
-            # scp -p -o StrictHostKeyChecking=no rpmdir/RPMS/*/*.rpm "${YUM_REPO_USER}@${YUM_REPO_HOST}:${bin_repo_dir}/"
-            # 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 "Deploying binary packages to ${YUM_REPO_HOST}:${bin_repo_dir}/ ..."
+          if [[ -n "$CI_COMMIT_TAG" || 1 == 1 ]] ; then
+              echo "scp -p -o StrictHostKeyChecking=no rpmdir/RPMS/*/*.rpm \"${YUM_REPO_USER}@${YUM_REPO_HOST}:${bin_repo_dir}/\""
+              # scp -p -o StrictHostKeyChecking=no rpmdir/RPMS/*/*.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 "Finished with EL version ${src_repo_dir}."
       done
-- 
2.39.5