Skip to content
Snippets Groups Projects
Commit 33862afa authored by OZGCloud's avatar OZGCloud
Browse files

e2e use kuby keycloak

parent 04bda3a9
No related branches found
No related tags found
No related merge requests found
...@@ -158,11 +158,11 @@ pipeline { ...@@ -158,11 +158,11 @@ pipeline {
} }
container("kubectl") { container("kubectl") {
sh 'kubectl rollout restart deployment/goofy -n sh-kiel-e2e' sh 'kubectl rollout restart deployment/goofy -n sh-e2e-dev'
sh 'kubectl rollout status deployment/goofy -n sh-kiel-e2e' sh 'kubectl rollout status deployment/goofy -n sh-e2e-dev'
sh 'kubectl rollout restart deployment/pluto -n sh-kiel-e2e' sh 'kubectl rollout restart deployment/pluto -n sh-e2e-dev'
sh 'kubectl rollout status deployment/pluto -n sh-kiel-e2e' sh 'kubectl rollout status deployment/pluto -n sh-e2e-dev'
} }
container("cypress") { container("cypress") {
......
{ {
"baseUrl": "https://e2e.dev.ozg-sh.de", "baseUrl": "https://e2e.dev.ozg-sh.de",
"env": { "env": {
"dbUrl": "e2e-test:JkejFfXD@192.168.101.11:30423", "dbUrl": "mongodb+srv://pluto-database-user:XnHhfznNWg65NNd@pluto-database-svc.sh-e2e-dev.svc.cluster.local/admin?ssl=false",
"database": "sh-kiel-e2e-test", "database": "pluto-database",
"keycloakRealm": "sh-kiel-dev", "keycloakRealm": "sh-e2e-dev",
"keycloakUrl": "https://sso.dev.ozg-sh.de/", "keycloakUrl": "https://sso.dev.ozg-sh.de/",
"keycloakClient": "goofy" "keycloakClient": "sh-e2e-dev-goofy"
}, },
"fileServerFolder": ".", "fileServerFolder": ".",
"fixturesFolder": "./src/fixtures", "fixturesFolder": "./src/fixtures",
......
{ {
"baseUrl": "http://localhost:4300", "baseUrl": "http://localhost:4300",
"env": { "env": {
"dbUrl": "localhost:27018", "dbUrl": "mongodb://localhost:27018",
"database": "test", "database": "test",
"keycloakRealm": "sh-kiel-dev", "keycloakRealm": "sh-e2e-dev",
"keycloakUrl": "https://sso.dev.ozg-sh.de/", "keycloakUrl": "https://sso.dev.ozg-sh.de/",
"keycloakClient": "goofy" "keycloakClient": "sh-e2e-dev-goofy"
}, },
"fileServerFolder": ".", "fileServerFolder": ".",
"fixturesFolder": "./src/fixtures", "fixturesFolder": "./src/fixtures",
......
...@@ -19,6 +19,8 @@ services: ...@@ -19,6 +19,8 @@ services:
ozg-goofy: ozg-goofy:
image: docker.ozg-sh.de/goofy:snapshot-latest image: docker.ozg-sh.de/goofy:snapshot-latest
environment: environment:
- KEYCLOAK_REALM=sh-e2e-dev
- KEYCLOAK_RESOURCE=sh-e2e-dev-goofy
- GRPC_CLIENT_PLUTO_ADDRESS=static://ozg-pluto:9090 - GRPC_CLIENT_PLUTO_ADDRESS=static://ozg-pluto:9090
- SPRING_PROFILES_ACTIVE=remotekc, e2e - SPRING_PROFILES_ACTIVE=remotekc, e2e
ports: ports:
......
{ {
"name": "kfinder", "name": "kfinder",
"password": "katrin" "password": "Katrinfinder"
} }
\ No newline at end of file
{ {
"name": "kordner", "name": "kordner",
"password": "klaus" "password": "Klausordner"
} }
\ No newline at end of file
{ {
"name": "test", "name": "test",
"password": "test" "password": "Testtest"
} }
\ No newline at end of file
{ {
"name": "test_ea", "name": "test_ea",
"password": "test_ea" "password": "Test_eatest"
} }
\ No newline at end of file
...@@ -162,5 +162,5 @@ function dropCollectionFromDatabase(config, collection) { ...@@ -162,5 +162,5 @@ function dropCollectionFromDatabase(config, collection) {
} }
function buildDatabaseUrl(config) { function buildDatabaseUrl(config) {
return `mongodb://${config.env.dbUrl}/`; return config.env.dbUrl;
} }
\ No newline at end of file
import { login } from './cypress-helper'; 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 //TODO: remove export -> after refactoring login-logout.e2e-spec.ts
export enum DatabaseUser { export enum DatabaseUser {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment