diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile index 8ac1c4c5e51206c5795e3476e07b2e4cacf69d56..ed3c35c8329e357afb77dce18bae66763b5ba8e3 100644 --- a/alfa-client/apps/alfa-e2e/Jenkinsfile +++ b/alfa-client/apps/alfa-e2e/Jenkinsfile @@ -55,9 +55,7 @@ pipeline { stage('Check branch') { steps { script { - if (env.BRANCH_NAME == 'PR-489' || isMasterBranch()) { - - } else { + if (!isMasterBranch()) { echo "Branchname "+env.BRANCH_NAME+" does not match, skipping e2e tests" SKIP_RUN = true } @@ -339,14 +337,6 @@ String getUpstreamProjects() { return "" } -Boolean isReleaseBranch() { - return env.BRANCH_NAME == 'release' -} - -Boolean isMasterBranch() { - return env.BRANCH_NAME == 'master' -} - def cloneGitopsRepo() { final email = "jenkins@ozg-sh.de" final name = "jenkins" @@ -398,6 +388,10 @@ Void initEnvAlfaDefaultVersions() { env.ALFA_HELM_REPO_URL = getHelmRepoUrl() } +Boolean isMasterBranch() { + return env.BRANCH_NAME == 'master' +} + String getHelmRepoUrl() { if (isReleaseBranch()) { return "https://nexus.ozg-sh.de/repository/ozg-base-apps" @@ -724,6 +718,10 @@ String getElementRoomId() { return masterRoomId } +Boolean isReleaseBranch() { + return env.BRANCH_NAME == 'release' +} + String getElementAccessToken() { withCredentials([string(credentialsId: 'element-login-json', variable: 'LOGIN_JSON')]) { return readJSON ( text: sh (script: '''curl -XPOST -d \"$LOGIN_JSON\" https://matrix.ozg-sh.de/_matrix/client/v3/login''', returnStdout: true)).access_token @@ -751,7 +749,7 @@ Void forwardMongoDbPort(String namespace) { echo "Forwarding MongoDB Port to local port ${dbPort}" def pidFile = generateMongoDbPortForwardPidFile(namespace) - + sh (script: "kubectl port-forward ozg-mongodb-0 ${dbPort}:27017 -n ${namespace} & echo \$! > ${pidFile}", returnStdout: true) sh "sleep 20"