From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 20 Dec 2021 17:29:05 +0000 (+0100)
Subject: Trying to fix .gitlab-ci.yml
X-Git-Tag: 0.4.1~4^2~2
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=3ccca90ddaf069d9c2f9b3d7621168d0e538eb2e;p=pixelpark%2Fpp-admin-tools.git

Trying to fix .gitlab-ci.yml
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e4c5ac..c73172f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -393,7 +393,14 @@ Sign EL 8 packages:
       if [[ -f "${HOME}/.ssh/config" ]] ; then
         echo "Content of ${HOME}/.ssh/config:"
         cat "${HOME}/.ssh/config"
+        echo
       fi
+  script:
+    - echo "Packages to deploy:"; find rpmdir/*RPMS -type f -print0 | xargs --null --no-run-if-empty ls -l -d --color=always
+    - scp -p -o StrictHostKeyChecking=no rpmdir/SRPMS/*.rpm "${YUM_REPO_USER}@${YUM_REPO_HOST}:${YUM_REPO_DIR}/src/"
+    - ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "cd ${YUM_REPO_DIR}/src/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata"
+    # - scp -p -o StrictHostKeyChecking=no rpmdir/RPMS/*/*.rpm "${YUM_REPO_USER}@${YUM_REPO_HOST}:${YUM_REPO_DIR}/${EL_MAJOR_VERSION}/"
+    # - ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "cd ${YUM_REPO_DIR}/${EL_MAJOR_VERSION}/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata"
   after_script:
     - rm -rf rpmdir
   environment:
@@ -409,12 +416,6 @@ Deploy packages EL7:
     - 'Sign EL 7 packages'
   dependencies:
     - 'Sign EL 7 packages'
-  script:
-    - echo "Packages to deploy:"; find rpmdir/*RPMS -type f -print0 | xargs --null --no-run-if-empty ls -l -d --color=always
-    - scp -p -o StrictHostKeyChecking=no rpmdir/SRPMS/*.rpm "${YUM_REPO_USER}@${YUM_REPO_HOST}:${YUM_REPO_DIR}/src/"
-    - ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "cd ${YUM_REPO_DIR}/src/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata"
-    # - 'scp -p -o StrictHostKeyChecking=no rpmdir/RPMS/*/*.rpm ${YUM_REPO_USER}@${YUM_REPO_HOST}:${YUM_REPO_DIR}/${EL_MAJOR_VERSION}/'
-    # - 'ssh -o StrictHostKeyChecking=no ${YUM_REPO_USER}@${YUM_REPO_HOST} "cd ${YUM_REPO_DIR}/${EL_MAJOR_VERSION}/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata"'
 
 # ---------------------------
 Deploy packages EL8:
@@ -426,12 +427,6 @@ Deploy packages EL8:
     - 'Sign EL 8 packages'
   dependencies:
     - 'Sign EL 8 packages'
-  script:
-    - echo "Packages to deploy:"; find rpmdir/*RPMS -type f -print0 | xargs --null --no-run-if-empty ls -l -d --color=always
-    - scp -p -o StrictHostKeyChecking=no rpmdir/SRPMS/*.rpm "${YUM_REPO_USER}@${YUM_REPO_HOST}:${YUM_REPO_DIR}/src/"
-    - ssh -o StrictHostKeyChecking=no "${YUM_REPO_USER}@${YUM_REPO_HOST}" "cd ${YUM_REPO_DIR}/src/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata"
-    # - 'scp -p -o StrictHostKeyChecking=no rpmdir/RPMS/*/*.rpm ${YUM_REPO_USER}@${YUM_REPO_HOST}:${YUM_REPO_DIR}/${EL_MAJOR_VERSION}/'
-    # - 'ssh -o StrictHostKeyChecking=no ${YUM_REPO_USER}@${YUM_REPO_HOST} "cd ${YUM_REPO_DIR}/${EL_MAJOR_VERSION}/ && createrepo --update . && chmod -v a+x repodata && chmod -Rv a+r repodata"'
 
 # ---------------------------
 # .notify-rules: