diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile
index af39449c370c6f429bebd41b81fc0c411067e7bc..95ff97c2adecac3cab235adb00545e1d7c2958a0 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile
@@ -83,8 +83,8 @@ pipeline {
script {
FAILED_STAGE = env.STAGE_NAME
- initEnvGoofyDefaultVersions()
- initEnvPlutoDefaultVersions()
+ initEnvAlfaDefaultVersions()
+ initEnvVorgangManagerDefaultVersions()
initEnvUserManagerDefaultVersions()
}
}
@@ -104,12 +104,12 @@ pipeline {
timeout(time: 5, unit: 'MINUTES') {
userVersions = input message: "Edit Default Values",
parameters: [
- string(name: "GoofyImageTag", defaultValue: env.GOOFY_IMAGE_TAG, trim: true),
- string(name: "GoofyHelmChartVersion", defaultValue: env.GOOFY_HELM_CHART_VERSION, trim: true),
- string(name: "GoofyHelmRepoUrl", defaultValue: env.GOOFY_HELM_REPO_URL, trim: true),
- string(name: "PlutoImageTag", defaultValue: env.PLUTO_IMAGE_TAG, trim: true),
- string(name: "PlutoHelmChartVersion", defaultValue: env.PLUTO_HELM_CHART_VERSION, trim: true),
- string(name: "PlutoHelmRepoUrl", defaultValue: env.PLUTO_HELM_REPO_URL, trim: true),
+ string(name: "AlfaImageTag", defaultValue: env.ALFA_IMAGE_TAG, trim: true),
+ string(name: "AlfaHelmChartVersion", defaultValue: env.ALFA_HELM_CHART_VERSION, trim: true),
+ string(name: "AlfaHelmRepoUrl", defaultValue: env.ALFA_HELM_REPO_URL, trim: true),
+ string(name: "VorgangManagerImageTag", defaultValue: env.VORGANG_MANAGER_IMAGE_TAG, trim: true),
+ string(name: "VorgangManagerHelmChartVersion", defaultValue: env.VORGANG_MANAGER_HELM_CHART_VERSION, trim: true),
+ string(name: "VorgangManagerHelmRepoUrl", defaultValue: env.VORGANG_MANAGER_HELM_REPO_URL, trim: true),
string(name: "UserManagerImageTag", defaultValue: env.USER_MANAGER_IMAGE_TAG, trim: true),
string(name: "UserManagerHelmChartVersion", defaultValue: env.USER_MANAGER_HELM_CHART_VERSION, trim: true),
string(name: "UserManagerHelmRepoUrl", defaultValue: env.USER_MANAGER_HELM_REPO_URL, trim: true)
@@ -131,7 +131,7 @@ pipeline {
FAILED_STAGE = env.STAGE_NAME
sh 'npm --version'
- dir('goofy-client') {
+ dir('alfa-client') {
sh 'echo "registry=https://nexus.ozg-sh.de/repository/npm-proxy" >> ~/.npmrc'
sh 'echo "//nexus.ozg-sh.de/:_auth=amVua2luczprTSFnNVUhMVQzNDZxWQ==" >> ~/.npmrc'
@@ -171,20 +171,20 @@ pipeline {
checkoutGitopsE2eBranch()
- deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
generateEaNamespaceYaml()
generateMainNamespaceYaml()
pushGitopsRepo()
- waitForKopStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
}
}
post {
failure {
script {
- deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
}
}
}
@@ -218,7 +218,7 @@ pipeline {
}
always {
script {
- publishE2ETestResult("einheitlicher-ansprechpartner", "Goofy E2E-Tests EA")
+ publishE2ETestResult("einheitlicher-ansprechpartner", "Alfa E2E-Tests EA")
}
}
}
@@ -245,7 +245,7 @@ pipeline {
}
always {
script {
- publishE2ETestResult("main-tests", "Goofy E2E-Tests main")
+ publishE2ETestResult("main-tests", "Alfa E2E-Tests main")
}
}
}
@@ -261,7 +261,7 @@ pipeline {
script {
FAILED_STAGE = env.STAGE_NAME
- deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
}
}
}
@@ -279,7 +279,7 @@ pipeline {
String getUpstreamProjects() {
if (isMasterBranch() || isReleaseBranch()){
- return "goofy/${env.BRANCH_NAME},pluto/${env.BRANCH_NAME},user-manager/${env.BRANCH_NAME}"
+ return "alfa/${env.BRANCH_NAME},vorgang-manager/${env.BRANCH_NAME},user-manager/${env.BRANCH_NAME}"
}
return ""
@@ -329,19 +329,19 @@ String getHelmChartVersion(Map applicationValues) {
return applicationValues.helm.version
}
-Void initEnvGoofyDefaultVersions() {
+Void initEnvAlfaDefaultVersions() {
if (isMasterBranch() || isReleaseBranch()) {
- goofyValues = getApplicationValues("goofy")
+ values = getApplicationValues('alfa')
- env.GOOFY_IMAGE_TAG = getImageTag(goofyValues)
- env.GOOFY_HELM_CHART_VERSION = getHelmChartVersion(goofyValues)
+ env.ALFA_IMAGE_TAG = getImageTag(values)
+ env.ALFA_HELM_CHART_VERSION = getHelmChartVersion(values)
}
else {
- env.GOOFY_IMAGE_TAG = getFeatureBranchImageTag()
- env.GOOFY_HELM_CHART_VERSION = getFeatureBranchHelmChartVersion()
+ env.ALFA_IMAGE_TAG = getFeatureBranchImageTag()
+ env.ALFA_HELM_CHART_VERSION = getFeatureBranchHelmChartVersion()
}
- env.GOOFY_HELM_REPO_URL = getHelmRepoUrl()
+ env.ALFA_HELM_REPO_URL = getHelmRepoUrl()
}
String getHelmRepoUrl() {
@@ -366,29 +366,29 @@ String getRootPomVersion() {
return rootPom.version
}
-Void initEnvPlutoDefaultVersions() {
- plutoValues = getApplicationValues("pluto")
+Void initEnvVorgangManagerDefaultVersions() {
+ values = getApplicationValues('vorgang-manager')
- env.PLUTO_IMAGE_TAG = getImageTag(plutoValues)
- env.PLUTO_HELM_CHART_VERSION = getHelmChartVersion(plutoValues)
- env.PLUTO_HELM_REPO_URL = getHelmRepoUrl()
+ env.VORGANG_MANAGER_IMAGE_TAG = getImageTag(values)
+ env.VORGANG_MANAGER_HELM_CHART_VERSION = getHelmChartVersion(values)
+ env.VORGANG_MANAGER_HELM_REPO_URL = getHelmRepoUrl()
}
Void initEnvUserManagerDefaultVersions() {
- userManagerValues = getApplicationValues("user-manager")
+ values = getApplicationValues('user-manager')
- env.USER_MANAGER_IMAGE_TAG = getImageTag(userManagerValues)
- env.USER_MANAGER_HELM_CHART_VERSION = getHelmChartVersion(userManagerValues)
+ env.USER_MANAGER_IMAGE_TAG = getImageTag(userManagvalueserValues)
+ env.USER_MANAGER_HELM_CHART_VERSION = getHelmChartVersion(values)
env.USER_MANAGER_HELM_REPO_URL = getHelmRepoUrl()
}
Void initEnvUserVersions(userVersions) {
- env.GOOFY_IMAGE_TAG = userVersions.GoofyImageTag
- env.GOOFY_HELM_CHART_VERSION = userVersions.GoofyHelmChartVersion
- env.GOOFY_HELM_REPO_URL = userVersions.GoofyHelmRepoUrl
- env.PLUTO_IMAGE_TAG = userVersions.PlutoImageTag
- env.PLUTO_HELM_CHART_VERSION = userVersions.PlutoHelmChartVersion
- env.PLUTO_HELM_REPO_URL = userVersions.PlutoHelmRepoUrl
+ env.ALFA_IMAGE_TAG = userVersions.AlfaImageTag
+ env.ALFA_HELM_CHART_VERSION = userVersions.AlfaHelmChartVersion
+ env.ALFA_HELM_REPO_URL = userVersions.AlfaHelmRepoUrl
+ env.VORGANG_MANAGER_IMAGE_TAG = userVersions.VorgangManagrImageTag
+ env.VORGANG_MANAGER_HELM_CHART_VERSION = userVersions.VorgangManagrHelmChartVersion
+ env.VORGANG_MANAGER_HELM_REPO_URL = userVersions.VorgangManagrHelmRepoUrl
env.USER_MANAGER_IMAGE_TAG = userVersions.UserManagerImageTag
env.USER_MANAGER_HELM_CHART_VERSION = userVersions.UserManagerHelmChartVersion
env.USER_MANAGER_HELM_REPO_URL = userVersions.UserManagerHelmRepoUrl
@@ -397,7 +397,7 @@ Void initEnvUserVersions(userVersions) {
Void pushGitopsRepo() {
withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
- dir("gitops") {
+ dir('gitops') {
if (hasUnpushedCommits()) {
sh 'git pull'
sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git'
@@ -411,7 +411,7 @@ Boolean hasUnpushedCommits() {
}
Void checkoutGitopsE2eBranch() {
- dir("gitops") {
+ dir('gitops') {
sh 'git checkout e2e'
}
}
@@ -425,20 +425,20 @@ Void generateMainNamespaceYaml() {
}
Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String userFolder) {
- def envValues = readYaml file: "goofy-client/apps/goofy-e2e/src/fixtures/argocd/" + valuesPathSuffix;
+ def envValues = readYaml file: "alfa-client/apps/alfa-e2e/src/fixtures/argocd/" + valuesPathSuffix;
- envValues.kop.bezeichner = bezeichner
- envValues.goofy.put("image", ['tag': env.GOOFY_IMAGE_TAG])
- envValues.goofy.put("helm", ['version': env.GOOFY_HELM_CHART_VERSION, 'repoUrl': env.GOOFY_HELM_REPO_URL])
+ envValues.ozgcloud.bezeichner = bezeichner
+ envValues.alfa.put("image", ['tag': env.ALFA_IMAGE_TAG])
+ envValues.alfa.put("helm", ['version': env.ALFA_HELM_CHART_VERSION, 'repoUrl': env.ALFA_HELM_REPO_URL])
- envValues.pluto.put("image", ['tag': env.PLUTO_IMAGE_TAG])
- envValues.pluto.put("helm", ['version': env.PLUTO_HELM_CHART_VERSION, 'repoUrl': env.PLUTO_HELM_REPO_URL])
+ envValues.vorgang_manager.put("image", ['tag': env.VORGANG_MANAGER_IMAGE_TAG])
+ envValues.vorgang_manager.put("helm", ['version': env.VORGANG_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.VORGANG_MANAGER_HELM_REPO_URL])
envValues.user_manager.put("image", ['tag': env.USER_MANAGER_IMAGE_TAG])
envValues.user_manager.put("helm", ['version': env.USER_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.USER_MANAGER_HELM_REPO_URL])
- envValues.goofy.sso.put("keycloak_groups", generateKeycloakGroupsForHelmChart())
- envValues.goofy.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))
+ envValues.alfa.sso.put("keycloak_groups", generateKeycloakGroupsForHelmChart())
+ envValues.alfa.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))
writeYaml file: "gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml", data: envValues, overwrite: true
@@ -451,12 +451,12 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us
}
List generateKeycloakUserForHelmChart(String userFolder) {
- def userFiles = sh (script: 'ls goofy-client/apps/goofy-e2e/src/fixtures/' + userFolder, returnStdout: true);
+ def userFiles = sh (script: 'ls alfa-client/apps/alfa-e2e/src/fixtures/' + userFolder, returnStdout: true);
def helmUsers = []
userFiles.split("\\n").each { userFile ->
- def userJson = readJSON file: "goofy-client/apps/goofy-e2e/src/fixtures/${userFolder}/${userFile}"
+ def userJson = readJSON file: "alfa-client/apps/alfa-e2e/src/fixtures/${userFolder}/${userFile}"
def user = [
"name": userJson.name,
"password": userJson.password,
@@ -483,19 +483,19 @@ List mapUserClientRoles(userClientRoles) {
def clientRoles = []
for(clientRole in userClientRoles) {
- clientRoles.add(['name': "alfa", 'role': clientRole])
+ clientRoles.add(['name': 'alfa', 'role': clientRole])
}
return clientRoles
}
List generateKeycloakGroupsForHelmChart() {
- def groupFiles = sh (script: 'ls goofy-client/apps/goofy-e2e/src/fixtures/group', returnStdout: true)
+ def groupFiles = sh (script: 'ls alfa-client/apps/alfa-e2e/src/fixtures/group', returnStdout: true)
def helmGroups = []
groupFiles.split("\\n").each { groupFile ->
- def groupJson = readJSON file: "goofy-client/apps/goofy-e2e/src/fixtures/group/${groupFile}"
+ def groupJson = readJSON file: "alfa-client/apps/alfa-e2e/src/fixtures/group/${groupFile}"
def group = ["name": groupJson.name]
groupJson.attributes.each { key, values ->
@@ -513,8 +513,8 @@ List generateKeycloakGroupsForHelmChart() {
return helmGroups
}
-Void deleteKopStack(kopBezeichner) {
- for(bezeichner in kopBezeichner) {
+Void deleteOzgCloudStack(ozgCloudBezeichner) {
+ for(bezeichner in ozgCloudBezeichner) {
if (hasNamespaceFile(bezeichner)) {
removeNamespaceFile(bezeichner)
}
@@ -522,7 +522,7 @@ Void deleteKopStack(kopBezeichner) {
pushGitopsRepo()
- for(bezeichner in kopBezeichner) {
+ for(bezeichner in ozgCloudBezeichner) {
waitForDeletion(bezeichner)
}
}
@@ -547,17 +547,17 @@ Void waitForDeletion(String bezeichner) {
}
}
-Void waitForKopStackRollout(kopBezeichner) {
- for(bezeichner in kopBezeichner) {
+Void waitForOzgCloudStackRollout(ozgCloudBezeichner) {
+ for(bezeichner in ozgCloudBezeichner) {
waitForRollout(bezeichner)
}
}
Void waitForRollout(String bezeichner) {
waitForHealthyApplication(bezeichner, 'application')
- waitForHealthyApplication(bezeichner, 'pluto')
+ waitForHealthyApplication(bezeichner, 'vorgang-manager')
waitForHealthyApplication(bezeichner, 'user-manager')
- waitForHealthyApplication(bezeichner, 'goofy')
+ waitForHealthyApplication(bezeichner, 'alfa')
}
Void waitForHealthyApplication(String bezeichner, String application) {
@@ -597,7 +597,7 @@ Void publishE2ETestResult(String reportFolder, String reportName) {
allowMissing: false,
alwaysLinkToLastBuild: false,
keepAll: true,
- reportDir: "goofy-client/apps/goofy-e2e/reports/${reportFolder}",
+ reportDir: "alfa-client/apps/alfa-e2e/reports/${reportFolder}",
reportFiles: 'report.html',
reportName: reportName
]
@@ -608,9 +608,9 @@ String runTests(String bezeichner, String reportFolder, Integer dbPort, String s
def config = generateCypressConfig(bezeichner, reportFolder, dbPort)
try {
- dir('goofy-client'){
+ dir('alfa-client'){
sh "npm run cypress:version"
- sh "apps/goofy-e2e/run-tests.sh ${reportFolder} ${config}"
+ sh "apps/alfa-e2e/run-tests.sh ${reportFolder} ${config}"
}
} catch (Exception e) {
printNpmDebugLog()
@@ -651,15 +651,15 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
def namespace = generateNamespace(bezeichner)
def configName = "cypress-ci-"+testFolder+".json"
- dir('goofy-client/apps/goofy-e2e/'){
+ dir('alfa-client/apps/alfa-e2e/'){
def config = readJSON file: 'cypress-ci.json'
- def plutoDatabaseSecret = getPlutoDatabaseSecret(namespace);
- def decodedPassword = decodeString(plutoDatabaseSecret.password);
+ def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace);
+ def decodedPassword = decodeString(vorgangManagerDatabaseSecret.password);
def parsablePassword = makePasswordUrlConform(decodedPassword);
config.baseUrl = "https://${bezeichner}.${env.CLUSTER_BASE_URL}" as String
- config.env.dbUrl = "mongodb://${decodeString(plutoDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String
+ config.env.dbUrl = "mongodb://${decodeString(vorgangManagerDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String
config.env.keycloakUrl = "https://${env.SSO_URL}/" as String
config.env.keycloakRealm = namespace as String
config.env.sabineUuid = getKeycloakUuid(namespace, "sabine") as String
@@ -684,8 +684,8 @@ String makePasswordUrlConform(String password) {
return sh (script: "printf %s ${password} | jq -sRr @uri", returnStdout: true);
}
-Map getPlutoDatabaseSecret(String namespace) {
- return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-pluto-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+Map getVorgangManagerDatabaseSecret(String namespace) {
+ return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-vorgang-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
}
Map getUserManagerEnv(String namespace, dbPort){