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

Finalizing .gitlab-ci.yml
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c73172f..6f2e713 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,7 +149,6 @@ Linter:
     - if: $CI_COMMIT_BRANCH == "master"
     - if: $CI_COMMIT_BRANCH == "main"
     - if: $CI_COMMIT_BRANCH == "test"
-    - if: $CI_COMMIT_BRANCH == "develop"
   tags:
     - docker
   needs:
@@ -291,7 +290,6 @@ build CentOS 8 with Python 3.8:
     - if: '$CI_COMMIT_TAG'
     - if: $CI_COMMIT_BRANCH == "master"
     - if: $CI_COMMIT_BRANCH == "main"
-    - if: $CI_COMMIT_BRANCH == "develop"
   stage: sign
   tags:
     - docker
@@ -369,9 +367,6 @@ Sign EL 8 packages:
     - if: '$CI_COMMIT_TAG'
       when: manual
       allow_failure: true
-    - if: $CI_COMMIT_BRANCH == "develop"
-      when: manual
-      allow_failure: true
   stage: deploy
   tags:
     - deploy_v2
@@ -399,8 +394,8 @@ Sign EL 8 packages:
     - 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"
+    - 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: