From 33862afad6e247377e153c043eff1834a2f7bfab Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Thu, 18 Nov 2021 16:56:18 +0100 Subject: [PATCH] e2e use kuby keycloak --- Jenkinsfile | 8 ++++---- goofy-client/apps/goofy-e2e/cypress-ci.json | 10 +++++----- goofy-client/apps/goofy-e2e/cypress.json | 6 +++--- goofy-client/apps/goofy-e2e/docker-compose.yml | 2 ++ .../apps/goofy-e2e/src/fixtures/user/user_kfinder.json | 2 +- .../apps/goofy-e2e/src/fixtures/user/user_kordner.json | 2 +- .../apps/goofy-e2e/src/fixtures/user/user_test.json | 2 +- .../apps/goofy-e2e/src/fixtures/user/user_test_ea.json | 2 +- goofy-client/apps/goofy-e2e/src/plugins/index.js | 2 +- goofy-client/apps/goofy-e2e/src/support/user-util.ts | 2 +- 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ade029b7d7..00acb98e66 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -158,11 +158,11 @@ pipeline { } container("kubectl") { - sh 'kubectl rollout restart deployment/goofy -n sh-kiel-e2e' - sh 'kubectl rollout status deployment/goofy -n sh-kiel-e2e' + sh 'kubectl rollout restart deployment/goofy -n sh-e2e-dev' + sh 'kubectl rollout status deployment/goofy -n sh-e2e-dev' - sh 'kubectl rollout restart deployment/pluto -n sh-kiel-e2e' - sh 'kubectl rollout status deployment/pluto -n sh-kiel-e2e' + sh 'kubectl rollout restart deployment/pluto -n sh-e2e-dev' + sh 'kubectl rollout status deployment/pluto -n sh-e2e-dev' } container("cypress") { diff --git a/goofy-client/apps/goofy-e2e/cypress-ci.json b/goofy-client/apps/goofy-e2e/cypress-ci.json index b443dbb810..e9ae33f9b5 100644 --- a/goofy-client/apps/goofy-e2e/cypress-ci.json +++ b/goofy-client/apps/goofy-e2e/cypress-ci.json @@ -1,11 +1,11 @@ { "baseUrl": "https://e2e.dev.ozg-sh.de", "env": { - "dbUrl": "e2e-test:JkejFfXD@192.168.101.11:30423", - "database": "sh-kiel-e2e-test", - "keycloakRealm": "sh-kiel-dev", - "keycloakUrl": "https://sso.dev.ozg-sh.de/", - "keycloakClient": "goofy" + "dbUrl": "mongodb+srv://pluto-database-user:XnHhfznNWg65NNd@pluto-database-svc.sh-e2e-dev.svc.cluster.local/admin?ssl=false", + "database": "pluto-database", + "keycloakRealm": "sh-e2e-dev", + "keycloakUrl": "https://sso.dev.ozg-sh.de/", + "keycloakClient": "sh-e2e-dev-goofy" }, "fileServerFolder": ".", "fixturesFolder": "./src/fixtures", diff --git a/goofy-client/apps/goofy-e2e/cypress.json b/goofy-client/apps/goofy-e2e/cypress.json index ddaa652ae6..ec5266e69b 100644 --- a/goofy-client/apps/goofy-e2e/cypress.json +++ b/goofy-client/apps/goofy-e2e/cypress.json @@ -1,11 +1,11 @@ { "baseUrl": "http://localhost:4300", "env": { - "dbUrl": "localhost:27018", + "dbUrl": "mongodb://localhost:27018", "database": "test", - "keycloakRealm": "sh-kiel-dev", + "keycloakRealm": "sh-e2e-dev", "keycloakUrl": "https://sso.dev.ozg-sh.de/", - "keycloakClient": "goofy" + "keycloakClient": "sh-e2e-dev-goofy" }, "fileServerFolder": ".", "fixturesFolder": "./src/fixtures", diff --git a/goofy-client/apps/goofy-e2e/docker-compose.yml b/goofy-client/apps/goofy-e2e/docker-compose.yml index db342e3a9c..f264102412 100644 --- a/goofy-client/apps/goofy-e2e/docker-compose.yml +++ b/goofy-client/apps/goofy-e2e/docker-compose.yml @@ -19,6 +19,8 @@ services: ozg-goofy: image: docker.ozg-sh.de/goofy:snapshot-latest environment: + - KEYCLOAK_REALM=sh-e2e-dev + - KEYCLOAK_RESOURCE=sh-e2e-dev-goofy - GRPC_CLIENT_PLUTO_ADDRESS=static://ozg-pluto:9090 - SPRING_PROFILES_ACTIVE=remotekc, e2e ports: diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kfinder.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kfinder.json index 1bbc05a0a1..c5d1fad187 100644 --- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kfinder.json +++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kfinder.json @@ -1,4 +1,4 @@ { "name": "kfinder", - "password": "katrin" + "password": "Katrinfinder" } \ No newline at end of file diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kordner.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kordner.json index 7a6c1fa0c0..408b253306 100644 --- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kordner.json +++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kordner.json @@ -1,4 +1,4 @@ { "name": "kordner", - "password": "klaus" + "password": "Klausordner" } \ No newline at end of file diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_test.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_test.json index 80c6d37d72..3c4f9992a0 100644 --- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_test.json +++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_test.json @@ -1,4 +1,4 @@ { "name": "test", - "password": "test" + "password": "Testtest" } \ No newline at end of file diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_test_ea.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_test_ea.json index 12a0ee4854..8a6ef0334b 100644 --- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_test_ea.json +++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_test_ea.json @@ -1,4 +1,4 @@ { "name": "test_ea", - "password": "test_ea" + "password": "Test_eatest" } \ No newline at end of file diff --git a/goofy-client/apps/goofy-e2e/src/plugins/index.js b/goofy-client/apps/goofy-e2e/src/plugins/index.js index 08576acf89..c540a75ba9 100644 --- a/goofy-client/apps/goofy-e2e/src/plugins/index.js +++ b/goofy-client/apps/goofy-e2e/src/plugins/index.js @@ -162,5 +162,5 @@ function dropCollectionFromDatabase(config, collection) { } function buildDatabaseUrl(config) { - return `mongodb://${config.env.dbUrl}/`; + return config.env.dbUrl; } \ No newline at end of file diff --git a/goofy-client/apps/goofy-e2e/src/support/user-util.ts b/goofy-client/apps/goofy-e2e/src/support/user-util.ts index bf9853ab40..2d1c7117c4 100644 --- a/goofy-client/apps/goofy-e2e/src/support/user-util.ts +++ b/goofy-client/apps/goofy-e2e/src/support/user-util.ts @@ -1,6 +1,6 @@ import { login } from './cypress-helper'; -export const BEATE_USER_UUID: string = 'b6a14460-5869-4aaf-ae53-7f8da32dd870'; +export const BEATE_USER_UUID: string = '8f3f8cee-75ee-4417-a61f-bb4294ca1ccb'; //TODO: remove export -> after refactoring login-logout.e2e-spec.ts export enum DatabaseUser { -- GitLab