From 7609dc55a4e2e7581cf3983c5ef6385d81dde1d0 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 6 Mar 2024 21:32:01 +0100
Subject: [PATCH] e2e disable rebase for gitops repo
---
alfa-client/apps/alfa-e2e/Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile
index 9cf97a8440..4bcfb93a75 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile
@@ -419,6 +419,7 @@ Void pushGitopsRepo() {
withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
dir('gitops') {
if (hasUnpushedCommits()) {
+ sh 'git config pull.rebase false'
sh 'git pull'
sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/ozgcloud-devops/gitops.git'
}
--
GitLab