From 084ceed9debfde4b6e3aedf10dbfaba82bef83a4 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 30 Oct 2023 10:28:36 +0100
Subject: [PATCH] e2e okd cluster
---
goofy-client/apps/goofy-e2e/Jenkinsfile | 6 +++---
.../apps/goofy-e2e/src/fixtures/argocd/by-ea-dev.yaml | 8 ++++----
.../apps/goofy-e2e/src/fixtures/argocd/by-main-dev.yaml | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/goofy-client/apps/goofy-e2e/Jenkinsfile b/goofy-client/apps/goofy-e2e/Jenkinsfile
index 6568225eb1..ea409ea465 100644
--- a/goofy-client/apps/goofy-e2e/Jenkinsfile
+++ b/goofy-client/apps/goofy-e2e/Jenkinsfile
@@ -16,8 +16,8 @@ pipeline {
environment {
BLUE_OCEAN_URL = "https://jenkins.ozg-sh.de/job/E2E%20Tests/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/"
BUNDESLAND = "by"
- SSO_URL = "sso.dev.by.ozg-cloud.de"
- CLUSTER_BASE_URL = "dev.by.ozg-cloud.de"
+ SSO_URL = "sso.load.by.ozg-cloud.de"
+ CLUSTER_BASE_URL = "load.by.ozg-cloud.de"
FAILED_STAGE = ""
FAILED_PARALLEL_STAGE = " "
EA_BEZEICHNER = generateBezeichner("e2e-ea")
@@ -412,7 +412,7 @@ Boolean hasUnpushedCommits() {
Void checkoutGitopsE2eBranch() {
dir("gitops") {
- sh 'git checkout e2e'
+ sh 'git checkout lasttest'
}
}
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-ea-dev.yaml b/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-ea-dev.yaml
index 3098a0bb11..47c72a170c 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-ea-dev.yaml
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-ea-dev.yaml
@@ -6,7 +6,7 @@ goofy:
env:
overrideSpringProfiles: "oc,ea,e2e,dev"
sso:
- serverUrl: https://sso.dev.by.ozg-cloud.de
+ serverUrl: https://sso.load.by.ozg-cloud.de
apiPassword: "Test1234!"
keycloak_clients:
- client_name: alfa
@@ -15,7 +15,7 @@ goofy:
ingress:
use_staging_cert: true
className: openshift-default
- baseUrl: dev.by.ozg-cloud.de
+ baseUrl: load.by.ozg-cloud.de
pluto:
env:
@@ -31,7 +31,7 @@ user_manager:
api:
password: "Test1234!"
sso:
- serverUrl: https://sso.dev.by.ozg-cloud.de
+ serverUrl: https://sso.load.by.ozg-cloud.de
api_user:
name: usermanagerapiuser
password: ApiUser123!
@@ -45,4 +45,4 @@ user_manager:
role: view-users
- name: realm-management
role: manage-users
- baseUrl: dev.by.ozg-cloud.de
\ No newline at end of file
+ baseUrl: load.by.ozg-cloud.de
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-main-dev.yaml b/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-main-dev.yaml
index 85bc54b965..9366a70210 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-main-dev.yaml
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-main-dev.yaml
@@ -6,12 +6,12 @@ goofy:
env:
overrideSpringProfiles: "oc,e2e,dev"
sso:
- serverUrl: https://sso.dev.by.ozg-cloud.de
+ serverUrl: https://sso.load.by.ozg-cloud.de
apiPassword: "Test1234!"
ingress:
use_staging_cert: true
className: openshift-default
- baseUrl: dev.by.ozg-cloud.de
+ baseUrl: load.by.ozg-cloud.de
pluto:
env:
@@ -27,7 +27,7 @@ user_manager:
api:
password: "Test1234!"
sso:
- serverUrl: https://sso.dev.by.ozg-cloud.de
+ serverUrl: https://sso.load.by.ozg-cloud.de
api_user:
name: usermanagerapiuser
password: ApiUser123!
@@ -41,4 +41,4 @@ user_manager:
role: view-users
- name: realm-management
role: manage-users
- baseUrl: dev.by.ozg-cloud.de
\ No newline at end of file
+ baseUrl: load.by.ozg-cloud.de
\ No newline at end of file
--
GitLab