diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile index 9cf97a8440f7f706069d4778704bd068c63e6e84..4bcfb93a754d678ebdecd7f15832df66360ebcb2 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' }