diff --git a/goofy-client/apps/goofy-e2e/Jenkinsfile b/goofy-client/apps/goofy-e2e/Jenkinsfile index a2d3aaf4a684ca4d52a5ce2fc5ef1653d827d3d9..6cf3ad53c272f1997b0095b7e3124851f4cc5d2f 100644 --- a/goofy-client/apps/goofy-e2e/Jenkinsfile +++ b/goofy-client/apps/goofy-e2e/Jenkinsfile @@ -151,7 +151,7 @@ pipeline { script { FAILED_STAGE = env.STAGE_NAME - configFileProvider([configFile(fileId: 'kubeconfig-ovh-cluster', variable: 'KUBE_CONFIG')]) { + configFileProvider([configFile(fileId: 'kubeconfig-dev-okd-cluster', variable: 'KUBE_CONFIG')]) { sh 'mkdir ~/.kube' sh 'cp ${KUBE_CONFIG} ~/.kube/config' } @@ -705,7 +705,7 @@ Map getUserManagerDatabaseSecret(String namespace) { String getKeycloakUuid(realm, userName) { def shScript = """curl -H 'Content-Type: application/json' \ - -H 'Authorization: bearer ${getKeycloakAccessToken()}' \ + -H 'Authorization: bearer ${getKeycloakAccessToken(realm)}' \ 'https://${env.SSO_URL}/admin/realms/${realm}/users' """ @@ -720,12 +720,21 @@ String getKeycloakUuid(realm, userName) { } } -String getKeycloakAccessToken() { - withCredentials([usernamePassword(credentialsId: 'keycloak-ovh-cluster', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { - def token = readJSON text: sh (script: 'curl -d "client_id=admin-cli" -d "username=$USER" -d "password=$PASSWORD" -d "grant_type=password" https://$SSO_URL/realms/master/protocol/openid-connect/token', returnStdout: true) +String getKeycloakAccessToken(String realm) { + userManagerApiUserCredentials = getUserManagerApiUserCredentials(realm) - return token.access_token - } + def token = readJSON text: sh (script: "set +x && curl -d \"client_id=admin-cli\" -d \"username=${userManagerApiUserCredentials.user}\" -d \"password=${userManagerApiUserCredentials.password}\" -d \"grant_type=password\" https://$SSO_URL/realms/$realm/protocol/openid-connect/token", returnStdout: true) + + return token.access_token +} + +Map getUserManagerApiUserCredentials(String namespace) { + userManagerApiUserCredentials = readJSON ( text: sh (script: "kubectl get secret usermanagerapiuser-credentials -n ${namespace} -o jsonpath={.data}", returnStdout: true)) + + return [ + "user": decodeString(userManagerApiUserCredentials.name), + "password": decodeString(userManagerApiUserCredentials.password) + ] } Void sendFailureMessage() { 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 0a18187db799a58c2400314050e44443e36d3599..0a7bac13ba55363111aa138ee5592e815b798fbb 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 @@ -1,7 +1,11 @@ kop: bezeichner: mastere2eea environment: dev - +e2eTest: true +project: + destinations: + - namespace: '*' + server: https://kubernetes.default.svc goofy: env: overrideSpringProfiles: "oc,ea,e2e,dev" @@ -14,6 +18,7 @@ goofy: - name: EINHEITLICHER_ANSPRECHPARTNER ingress: use_staging_cert: true + className: openshift-default baseUrl: dev.by.ozg-cloud.de pluto: @@ -44,4 +49,8 @@ user_manager: role: view-users - name: realm-management role: manage-users - baseUrl: dev.by.ozg-cloud.de \ No newline at end of file + baseUrl: dev.by.ozg-cloud.de + + ingress: + use_staging_cert: true + className: openshift-default \ 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 462ead53f18ef32acd8a7e141d64248564c562be..bd69db0457d9187ad5b1bef98bdb103d63065a77 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 @@ -1,7 +1,11 @@ kop: bezeichner: mastere2emain environment: dev - +e2eTest: true +project: + destinations: + - namespace: '*' + server: https://kubernetes.default.svc goofy: env: overrideSpringProfiles: "oc,e2e,dev" @@ -10,6 +14,7 @@ goofy: apiPassword: "Test1234!" ingress: use_staging_cert: true + className: openshift-default baseUrl: dev.by.ozg-cloud.de pluto: @@ -40,4 +45,8 @@ user_manager: role: view-users - name: realm-management role: manage-users - baseUrl: dev.by.ozg-cloud.de \ No newline at end of file + baseUrl: dev.by.ozg-cloud.de + + ingress: + use_staging_cert: true + className: openshift-default \ No newline at end of file