diff --git a/alfa-client/apps/admin/Jenkinsfile b/alfa-client/apps/admin/Jenkinsfile index 5f3f5ae78e683a9da5135447c0f6afff2987bc2f..355357c2a7cfed3eeef89a1ed73388068fad6e3a 100644 --- a/alfa-client/apps/admin/Jenkinsfile +++ b/alfa-client/apps/admin/Jenkinsfile @@ -315,4 +315,23 @@ 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 } +} + +Boolean isReleaseVersion(List versions) { + return matchRegexVersion(versions, RELEASE_REGEX) +} + +Boolean isSnapshotVersion(List versions) { + return matchRegexVersion(versions, SNAPSHOT_REGEX) +} + +Boolean matchRegexVersion(List versions, String regex) { + for (version in versions) { + println version + if ( !(version ==~ regex) ) { + return false + } + } + + return true } \ No newline at end of file diff --git a/alfa-client/apps/info/Jenkinsfile b/alfa-client/apps/info/Jenkinsfile index 9d859c208764e6c0099f07351b89fcdff3f93434..91de266aa532db877a5f43f3580f9faa85014b98 100644 --- a/alfa-client/apps/info/Jenkinsfile +++ b/alfa-client/apps/info/Jenkinsfile @@ -26,6 +26,16 @@ pipeline { FAILED_STAGE = env.STAGE_NAME dir('alfa-client') { VERSION = getInfoPackageJsonVersion() + + if(isReleaseBranch()){ + if ( !isReleaseVersion([VERSION]) ) { + error("Keine Release Version für Branch ${env.BRANCH_NAME}.") + } + } else { + if ( !isSnapshotVersion([VERSION]) ) { + error("Keine Snapshot Version für Branch ${env.BRANCH_NAME}.") + } + } } } } @@ -294,4 +304,23 @@ 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 } +} + +Boolean isReleaseVersion(List versions) { + return matchRegexVersion(versions, RELEASE_REGEX) +} + +Boolean isSnapshotVersion(List versions) { + return matchRegexVersion(versions, SNAPSHOT_REGEX) +} + +Boolean matchRegexVersion(List versions, String regex) { + for (version in versions) { + println version + if ( !(version ==~ regex) ) { + return false + } + } + + return true } \ No newline at end of file