From dfec5b5fbaf77ded2045883a54fdb42a14d0ed01 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 24 Nov 2023 19:07:47 +0100
Subject: [PATCH] OZG-4190 OZG-4560 One renaming step to fast - revert (3)
---
goofy-client/apps/alfa-e2e/Jenkinsfile | 14 +++++++-------
goofy-client/apps/alfa-e2e/Jenkinsfile-static | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/goofy-client/apps/alfa-e2e/Jenkinsfile b/goofy-client/apps/alfa-e2e/Jenkinsfile
index 4e37f92976..bd7df68de0 100644
--- a/goofy-client/apps/alfa-e2e/Jenkinsfile
+++ b/goofy-client/apps/alfa-e2e/Jenkinsfile
@@ -452,7 +452,7 @@ Void generateMainNamespaceYaml() {
}
Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String userFolder) {
- def envValues = readYaml file: "alfa/apps/alfa-e2e/src/fixtures/argocd/" + valuesPathSuffix;
+ def envValues = readYaml file: "goofy-client/apps/alfa-e2e/src/fixtures/argocd/" + valuesPathSuffix;
envValues.kop.bezeichner = bezeichner
envValues.goofy.put("image", ['tag': env.GOOFY_IMAGE_TAG])
@@ -478,12 +478,12 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us
}
List generateKeycloakUserForHelmChart(String userFolder) {
- def userFiles = sh (script: 'ls alfa/apps/alfa-e2e/src/fixtures/' + userFolder, returnStdout: true);
+ def userFiles = sh (script: 'ls goofy-client/apps/alfa-e2e/src/fixtures/' + userFolder, returnStdout: true);
def helmUsers = []
userFiles.split("\\n").each { userFile ->
- def userJson = readJSON file: "alfa/apps/alfa-e2e/src/fixtures/${userFolder}/${userFile}"
+ def userJson = readJSON file: "goofy-client/apps/alfa-e2e/src/fixtures/${userFolder}/${userFile}"
def user = [
"name": userJson.name,
"password": userJson.password,
@@ -517,12 +517,12 @@ List mapUserClientRoles(userClientRoles) {
}
List generateKeycloakGroupsForHelmChart() {
- def groupFiles = sh (script: 'ls alfa/apps/alfa-e2e/src/fixtures/group', returnStdout: true)
+ def groupFiles = sh (script: 'ls goofy-client/apps/alfa-e2e/src/fixtures/group', returnStdout: true)
def helmGroups = []
groupFiles.split("\\n").each { groupFile ->
- def groupJson = readJSON file: "alfa/apps/alfa-e2e/src/fixtures/group/${groupFile}"
+ def groupJson = readJSON file: "goofy-client/apps/alfa-e2e/src/fixtures/group/${groupFile}"
def group = ["name": groupJson.name]
groupJson.attributes.each { key, values ->
@@ -624,7 +624,7 @@ Void publishE2ETestResult(String reportFolder, String reportName) {
allowMissing: false,
alwaysLinkToLastBuild: false,
keepAll: true,
- reportDir: "alfa/apps/alfa-e2e/reports/${reportFolder}",
+ reportDir: "goofy-client/apps/alfa-e2e/reports/${reportFolder}",
reportFiles: 'report.html',
reportName: reportName
]
@@ -678,7 +678,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
def namespace = generateNamespace(bezeichner)
def configName = "cypress-ci-"+testFolder+".json"
- dir('alfa/apps/alfa-e2e/'){
+ dir('goofy-client/apps/alfa-e2e/'){
def config = readJSON file: 'cypress-ci.json'
def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace);
diff --git a/goofy-client/apps/alfa-e2e/Jenkinsfile-static b/goofy-client/apps/alfa-e2e/Jenkinsfile-static
index 853dd23f83..78e8beb656 100644
--- a/goofy-client/apps/alfa-e2e/Jenkinsfile-static
+++ b/goofy-client/apps/alfa-e2e/Jenkinsfile-static
@@ -333,7 +333,7 @@ String runTests(String bezeichner, String reportFolder, Integer dbPort, String s
try {
dir('goofy-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()
--
GitLab