OZG-7021 OZG-7217 Add missing functions

b61ea5c5 · OZGCloud · 45edf184 · b61ea5c5
Commit b61ea5c5 authored 7 months ago by OZGCloud
--- a/alfa-client/apps/info/Jenkinsfile
+++ b/alfa-client/apps/info/Jenkinsfile
@@ -56,47 +56,17 @@ pipeline {
    }
  }
 }
-Void deployHelmChart(String helmChartVersion) {
+Boolean isReleaseBranch() {
-  withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+    return env.BRANCH_NAME == 'release-admin'
-    if (isReleaseBranch()) {
-      result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@alfa-''' + helmChartVersion + '''.tgz''', returnStdout: true
-    }
-    else {
-      result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@alfa-''' + helmChartVersion + '''.tgz''', returnStdout: true
-    }
-    if (result != '') {
-      error(result)
-    }
-  }
-}
-String generateHelmChartVersion() {
-  def chartVersion = "${VERSION}"
-  if (isMasterBranch()) {
-    chartVersion += getCommitHash()
-  }
-  else if (isBarrierefreiheitBranch()) {
-    chartVersion += "-barrierefreiheit${getCommitHash()}"
-  }
-  else if (!isReleaseBranch()) {
-    chartVersion += "-${env.BRANCH_NAME}"
-  }
-  return chartVersion.replaceAll("_", "-")
-}
-Void tagAndPushDockerImage(String newTag) {
-  withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
-    sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
-    sh "docker tag docker.ozg-sh.de/alfa:${IMAGE_TAG} docker.ozg-sh.de/alfa:${newTag}"
-    sh "docker push docker.ozg-sh.de/alfa:${newTag}"
-  }
 }
 String generateImageTag() {
    def imageTag = "${env.BRANCH_NAME}-${VERSION}"
-  if (isMasterBranch() || isBarrierefreiheitBranch()) {
-    imageTag += getCommitHash()
+    if (isMasterBranch()) {
+        imageTag += "-${env.GIT_COMMIT.take(7)}"
    }
    return imageTag
 }
@@ -107,50 +77,16 @@ Void cloneGitopsRepo() {
    configureGit()
 }
-Void pushGitopsRepo() {
-  withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
-    dir("gitops") {
-      if (hasUnpushedCommits()) {
-        sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/ozgcloud-devops/gitops.git'
-      }
-    }
-  }
-}
-Boolean hasUnpushedCommits() {
-  return sh (script: "git cherry -v | grep .", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
-}
 Void configureGit() {
    final email = "jenkins@ozg-sh.de"
    final name = "jenkins"
    dir("gitops") {
        sh "git config user.email '${email}'"
        sh "git config user.name '${name}'"
    }
 }
-Void sendFailureMessage() {
-  def room = ''
-  def data = """{"msgtype":"m.text", \
-                    "body":"Alfa: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER} Link: ${BLUE_OCEAN_URL}", \
-                    "format": "org.matrix.custom.html", \
-                    "formatted_body":"Alfa: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${BLUE_OCEAN_URL}'>${env.BUILD_NUMBER}</a>"}"""
-  if (isMasterBranch()) {
-    room = "!iQPAvQIiRwRpNOszjw:matrix.ozg-sh.de"
-  }
-  else if (isReleaseBranch()) {
-    room = "!oWZpUGTFsxkJIYNfYg:matrix.ozg-sh.de"
-  }
-  sh "curl -XPOST -H 'authorization: Bearer ${getElementAccessToken()}' -d '${data}' https://matrix.ozg-sh.de/_matrix/client/v3/rooms/$room/send/m.room.message"
-}
-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
-  }
-}
 Void setNewDevVersion() {
    setNewGitopsVersion("dev")
 }
@@ -160,83 +96,107 @@ Void setNewTestVersion() {
 }
 Void setNewGitopsVersion(String environment) {
-  def envFile = "${environment}/application/values/alfa-values.yaml"
-  def commitMessage = "jenkins rollout ${environment} alfa version ${IMAGE_TAG}";
-  setNewGitopsVersion(envFile, commitMessage);
-}
-Void setNewBarrierefreiheitVersion() {
-  def envFile = "dev/namespace/namespaces/by-barrierefreiheit-dev.yaml"
-  def commitMessage = "jenkins rollout ${IMAGE_TAG} for Barrierefreiheit Dev"
-  setNewGitopsVersion(envFile, commitMessage);
-}
-Void setNewGitopsVersion(String envFile, String commitMessage) {
    dir("gitops") {
+        def envFile = "${environment}/application/values/admin-client-values.yaml"
        def envVersions = readYaml file: envFile
-    envVersions.alfa.image.tag = IMAGE_TAG
-    envVersions.alfa.helm.version = HELM_CHART_VERSION
+        envVersions.admin_client.image.tag = IMAGE_TAG
+        envVersions.admin_client.helm.version = HELM_CHART_VERSION
        writeYaml file: envFile, data: envVersions, overwrite: true
-    if (hasValuesFileChanged(envFile)) {
+        if (hasValuesFileChanged(environment)) {
            sh "git add ${envFile}"
-      sh "git commit -m '${commitMessage}'"
+            sh "git commit -m 'jenkins rollout ${environment} admin_client version ${IMAGE_TAG}'"
        }
    }
 }
-String getCommitHash() {
+Boolean hasValuesFileChanged(String environment) {
-  return "-${env.GIT_COMMIT.take(7)}";
+    return sh (script: "git status | grep '${environment}/application/values/admin-client-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
-Boolean hasValuesFileChanged(String envFile) {
-  return sh (script: "git status | grep '${envFile}'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
-}
-Boolean isReleaseBranch() {
+Void pushGitopsRepo() {
-  return env.BRANCH_NAME == 'release'
+    withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
+        dir("gitops") {
+            if (hasUnpushedCommits()) {
+                sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/ozgcloud-devops/gitops.git'
+            }
+        }
+    }
 }
-Boolean isMasterBranch() {
+Boolean hasUnpushedCommits() {
-  return env.BRANCH_NAME == 'master'
+    return sh (script: "git cherry -v | grep .", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
-Boolean isBarrierefreiheitBranch() {
+Void tagAndPushDockerImage(String newTag){
-  return env.BRANCH_NAME == 'barrierefreiheit-dev'
+    withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
+        sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
+        sh "docker tag docker.ozg-sh.de/admin-client:build-latest docker.ozg-sh.de/admin-client:${newTag}"
+        sh "docker push docker.ozg-sh.de/admin-client:${newTag}"
+    }
+}
+String getPackagejsonVersion() {
+    def packageJSON = readJSON file: 'package.json'
+    def packageJSONVersion = packageJSON.version
+    echo packageJSONVersion
+    return packageJSONVersion
 }
-Boolean isReleaseVersion(List versions) {
+Void deployHelmChart(String helmChartVersion) {
-  return matchRegexVersion(versions, RELEASE_REGEX)
+    withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){
+        if (isReleaseBranch()) {
+            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@admin-client-'''+helmChartVersion+'''.tgz''', returnStdout: true
+        }
+        else {
+            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@admin-client-'''+helmChartVersion+'''.tgz''', returnStdout: true
        }
-Boolean isSnapshotVersion(List versions) {
+        if (result != '') {
-  return matchRegexVersion(versions, SNAPSHOT_REGEX)
+            error(result)
+        }
    }
+}
+String generateHelmChartVersion() {
+    def chartVersion = "${VERSION}"
-Boolean matchRegexVersion(List versions, String regex) {
+    if (isMasterBranch()) {
-  for (version in versions) {
+        chartVersion += "-${env.GIT_COMMIT.take(7)}"
-    println version
-    if (!(version ==~ regex)) {
-      return false
    }
+    else if (!isReleaseBranch()) {
+        chartVersion += "-${env.BRANCH_NAME}"
    }
-  return true
+    return chartVersion.replaceAll("_", "-")
 }
-Boolean isSameVersion(List versions, String expectedVersion) {
+Boolean isMasterBranch() {
-  for (version in versions) {
+    return env.BRANCH_NAME == 'master'
-    if (version != expectedVersion) {
-      return false
 }
+Void sendFailureMessage() {
+    def room = ''
+    def data = """{"msgtype":"m.text", \
+                    "body":"Admin-Client: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER} Link: ${BLUE_OCEAN_URL}", \
+                    "format": "org.matrix.custom.html", \
+                    "formatted_body":"Admin-Client: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${BLUE_OCEAN_URL}'>${env.BUILD_NUMBER}</a>"}"""
+    if (isMasterBranch()) {
+        room = "!iQPAvQIiRwRpNOszjw:matrix.ozg-sh.de"
    }
-  return true
+    else if (isReleaseBranch()) {
+        room = "!oWZpUGTFsxkJIYNfYg:matrix.ozg-sh.de"
    }
-String getRootPomVersion() {
+    sh "curl -XPOST -H 'authorization: Bearer ${getElementAccessToken()}' -d '${data}' https://matrix.ozg-sh.de/_matrix/client/v3/rooms/$room/send/m.room.message"
-  def rootPom = readMavenPom file: 'pom.xml'
-  return rootPom.version
 }
-String getParentPomVersion(String filePath) {
+String getElementAccessToken() {
-  def pom = readMavenPom file: filePath
+    withCredentials([string(credentialsId: 'element-login-json', variable: 'LOGIN_JSON')]) {
-  return pom.parent.version
+        return readJSON ( text: sh (script: '''curl -XPOST -d \"$LOGIN_JSON\" https://matrix.ozg-sh.de/_matrix/client/v3/login''', returnStdout: true)).access_token
+    }
 }
\ No newline at end of file