Skip to content
Snippets Groups Projects
Commit 87df6be2 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3420 timeout

parent 094bb142
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ pipeline { ...@@ -26,7 +26,7 @@ pipeline {
} }
options { options {
timeout(time: 1, unit: 'HOURS') timeout(time: 2, unit: 'HOURS')
disableConcurrentBuilds() disableConcurrentBuilds()
buildDiscarder(logRotator(numToKeepStr: '5')) buildDiscarder(logRotator(numToKeepStr: '5'))
skipDefaultCheckout(true) skipDefaultCheckout(true)
...@@ -376,6 +376,7 @@ Void pushGitopsRepo() { ...@@ -376,6 +376,7 @@ Void pushGitopsRepo() {
withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) { withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
dir("gitops") { dir("gitops") {
if (hasUnpushedCommits()) { if (hasUnpushedCommits()) {
sh 'git pull'
sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git' sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git'
} }
} }
...@@ -516,7 +517,7 @@ Boolean hasNamespaceFile(String bezeichner) { ...@@ -516,7 +517,7 @@ Boolean hasNamespaceFile(String bezeichner) {
Void waitForDeletion(String bezeichner) { Void waitForDeletion(String bezeichner) {
try { 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) { } catch (Exception e) {
error("Application by-${bezeichner}-dev-application konnte nicht gelöscht werden") error("Application by-${bezeichner}-dev-application konnte nicht gelöscht werden")
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment