diff --git a/goofy-client/apps/goofy-e2e/Jenkinsfile b/goofy-client/apps/goofy-e2e/Jenkinsfile index a0abb7790e6a4c025840c7353f59324e25587c24..c196c002150ce71d6442e8dd5ee0e181e3562e83 100644 --- a/goofy-client/apps/goofy-e2e/Jenkinsfile +++ b/goofy-client/apps/goofy-e2e/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { } options { - timeout(time: 1, unit: 'HOURS') + timeout(time: 2, unit: 'HOURS') disableConcurrentBuilds() buildDiscarder(logRotator(numToKeepStr: '5')) skipDefaultCheckout(true) @@ -376,6 +376,7 @@ Void pushGitopsRepo() { withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) { dir("gitops") { if (hasUnpushedCommits()) { + sh 'git pull' sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git' } } @@ -516,7 +517,7 @@ Boolean hasNamespaceFile(String bezeichner) { Void waitForDeletion(String bezeichner) { try { - sh "kubectl wait --for=delete applications/by-${bezeichner}-dev-application -n argocd --timeout=300s" + sh "kubectl wait --for=delete applications/by-${bezeichner}-dev-application -n argocd --timeout=900s" } catch (Exception e) { error("Application by-${bezeichner}-dev-application konnte nicht gelöscht werden") }