diff --git a/Jenkinsfile b/Jenkinsfile
index ade029b7d73caa0810f29022d14ceb4d8fb50404..00acb98e6634d9366074d862a4f6eb31b7d7c0f8 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 b443dbb8103aa6f4a85442b2a9a8b14829beea2e..e9ae33f9b5536c4362ae095cb37566d4b2eee0b3 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 ddaa652ae61bc84b990cbca07893232cf8d6e329..ec5266e69bde94ca10fd4960eb3b798aa2ad7dab 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 db342e3a9c27837dd35db32f957a33296bd53eb0..f264102412ee67777077536c16fea0b6d35b8765 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 1bbc05a0a1192cec5ee93f94c4f55e970b4d9278..c5d1fad187108c1f26eeb2a8649b1ec0aefe7ebd 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 7a6c1fa0c01d3d8afa7ed3af3cade6f173547c63..408b2533066851a002daab1a045d2cd8bdc8c6a6 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 80c6d37d72f48f8973233ff5e3581c79ae22f856..3c4f9992a02b8970b0adcc65e43d4e1a4294a5e7 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 12a0ee4854d80669de944a66afb2637105773acc..8a6ef0334bca964571798351cb0fb38022e5d160 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 08576acf8949bd9c564da4636f20d8a98742dfbc..c540a75ba9f97a0d36b77870149a5e18635ff4f3 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 bf9853ab40e48cb5ea517a80caf9f1defde6ab89..2d1c7117c4deae85b79ab0b9fed3b5da8a541504 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 {