diff --git a/Jenkinsfile b/Jenkinsfile
index bd9d67aa1aa331c6984559c8b4ee5122eecaa095..79d9606a896daf044341e6232ba191cb89c3a142 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,15 +64,14 @@ pipeline {
else {
sh 'npm run ci-build'
}
-
- sh 'npm run ci-test'
-
try {
if (isMasterBranch()) {
withSonarQubeEnv('sonarqube-ozg-sh'){
sh 'npm run ci-sonar'
}
- }
+ } else {
+ sh 'npm run ci-test'
+ }
} catch (Exception e) {
unstable("SonarQube failed")
}
diff --git a/goofy-client/apps/alfa-e2e/Jenkinsfile b/goofy-client/apps/alfa-e2e/Jenkinsfile
index 94ab1c85da7dc64b9b798974a02d3a71c4725ba5..4e37f92976b8d8e35e62ea5fd0606ab1c852b001 100644
--- a/goofy-client/apps/alfa-e2e/Jenkinsfile
+++ b/goofy-client/apps/alfa-e2e/Jenkinsfile
@@ -161,7 +161,7 @@ pipeline {
}
}
- stage('Rollout E2E Namespaces') {
+ stage('Rollout E2E Main') {
when {
expression { !SKIP_RUN }
}
@@ -171,20 +171,47 @@ pipeline {
checkoutGitopsE2eBranch()
- deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ deleteKopStack([env.MAIN_BEZEICHNER])
- generateEaNamespaceYaml()
generateMainNamespaceYaml()
pushGitopsRepo()
- waitForKopStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ waitForKopStackRollout([env.MAIN_BEZEICHNER])
+ }
+ }
+ post {
+ failure {
+ script {
+ deleteKopStack([env.MAIN_BEZEICHNER])
+ }
+ }
+ }
+ }
+
+ stage('Rollout E2E EA') {
+ when {
+ expression { !SKIP_RUN }
+ }
+ steps {
+ script {
+ FAILED_STAGE = env.STAGE_NAME
+
+ checkoutGitopsE2eBranch()
+
+ deleteKopStack([env.EA_BEZEICHNER])
+
+ generateEaNamespaceYaml()
+
+ pushGitopsRepo()
+
+ waitForKopStackRollout([env.EA_BEZEICHNER])
}
}
post {
failure {
script {
- deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ deleteKopStack([env.EA_BEZEICHNER])
}
}
}
diff --git a/goofy-client/apps/alfa-e2e/Jenkinsfile-static b/goofy-client/apps/alfa-e2e/Jenkinsfile-static
index c469f7233b99252edb30ca7fe1237e041e9751cf..7c6798a0fe172855d4b26c01c0186a860e42a77c 100644
--- a/goofy-client/apps/alfa-e2e/Jenkinsfile-static
+++ b/goofy-client/apps/alfa-e2e/Jenkinsfile-static
@@ -9,20 +9,20 @@ def EXECUTE_MAIN = false;
pipeline {
agent {
node {
- label 'jenkins-build-agent-nodejs-16'
+ label 'jenkins-build-agent-nodejs-18'
}
}
environment {
BLUE_OCEAN_URL = "https://jenkins.ozg-sh.de/job/E2E%20Tests/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/"
- BUNDESLAND = "by"
- ENVIRONMENT = "dev"
- SSO_URL = "sso.dev.by.ozg-cloud.de"
- CLUSTER_BASE_URL = "dev.by.ozg-cloud.de"
- FAILED_STAGE = ""
- FAILED_PARALLEL_STAGE = " "
- EA_BEZEICHNER = "e2e-ea"
- MAIN_BEZEICHNER = "e2e-main"
+ BUNDESLAND = 'by'
+ ENVIRONMENT = 'dev'
+ SSO_URL = 'sso.dev.by.ozg-cloud.de'
+ CLUSTER_BASE_URL = 'dev.by.ozg-cloud.de'
+ FAILED_STAGE = ''
+ FAILED_PARALLEL_STAGE = ' '
+ EA_BEZEICHNER = 'e2e-ea'
+ MAIN_BEZEICHNER = 'e2e-main'
SH_SUCCESS_STATUS_CODE = 0
}
@@ -30,7 +30,7 @@ pipeline {
options {
timeout(time: 2, unit: 'HOURS')
disableConcurrentBuilds()
- buildDiscarder(logRotator(numToKeepStr: '5'))
+ buildDiscarder(logRotator(numToKeepStr: '10'))
skipDefaultCheckout(true)
}
@@ -62,7 +62,7 @@ pipeline {
}
}
}
- stage("Clone Gitops Repo") {
+ stage('Clone Gitops Repo') {
when {
expression { !SKIP_RUN }
}
@@ -75,8 +75,7 @@ pipeline {
}
}
-
- stage("Update Namespaces?(Alfa)") {
+ stage('Update Alfa?') {
when {
expression { !SKIP_RUN }
beforeInput true
@@ -88,7 +87,7 @@ pipeline {
catchError {
timeout(time: 5, unit: 'MINUTES') {
- userInput = input message: "Update Namespace?", parameters: [
+ userInput = input message: 'Update Namespace?', parameters: [
booleanParam(name: 'UpdateNamespaceToCurrentMaster', defaultValue: false)
]
UPDATE_NAMESPACE = userInput;
@@ -99,7 +98,7 @@ pipeline {
}
}
- stage("Do Update Namespaces(Alfa)") {
+ stage('Do Update Namespaces(Alfa)') {
when {
expression { !SKIP_RUN && UPDATE_NAMESPACE }
beforeInput true
@@ -115,7 +114,7 @@ pipeline {
}
}
- stage("Test Execution") {
+ stage('Test Execution') {
when {
expression { !SKIP_RUN && !UPDATE_NAMESPACE }
beforeInput true
@@ -142,7 +141,7 @@ pipeline {
}
}
- stage("Install Cypress") {
+ stage('Install Cypress') {
when {
expression { !SKIP_RUN && !UPDATE_NAMESPACE && (EXECUTE_EA || EXECUTE_MAIN) }
}
@@ -153,7 +152,7 @@ pipeline {
sh 'npm --version'
dir('alfa') {
sh 'echo "registry=https://nexus.ozg-sh.de/repository/npm-proxy" >> ~/.npmrc'
- sh 'echo "//nexus.ozg-sh.de/:_auth=amVua2luczpQaihzX0ZNNFU5ZC8=" >> ~/.npmrc'
+ sh 'echo "//nexus.ozg-sh.de/:_auth=amVua2luczprTSFnNVUhMVQzNDZxWQ==" >> ~/.npmrc'
sh 'npm cache verify'
sh 'npm install'
@@ -171,7 +170,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'
}
@@ -181,70 +180,61 @@ pipeline {
}
}
- stage('Run E2E-Tests') {
+ stage('E2E-EA') {
when {
- expression { !SKIP_RUN && !UPDATE_NAMESPACE }
+ expression { EXECUTE_EA && (!SKIP_RUN && !UPDATE_NAMESPACE) }
}
- failFast false
-
- parallel {
- stage('E2E-EA') {
- when {
- expression { EXECUTE_EA }
- }
- steps {
- catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
- script {
- def bezeichner = env.EA_BEZEICHNER
- def dbPort = 27018
-
- forwardServices(generateNamespace(bezeichner), dbPort)
-
- runTests(bezeichner, 'einheitlicher-ansprechpartner', dbPort, env.STAGE_NAME)
- }
- }
+ steps {
+ catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+ script {
+ def bezeichner = env.EA_BEZEICHNER
+ def dbPort = 27018
+
+ forwardServices(generateNamespace(bezeichner), dbPort)
+
+ runTests(bezeichner, 'einheitlicher-ansprechpartner', dbPort, env.STAGE_NAME)
}
- post {
- failure {
- script {
- FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
- }
- }
- always {
- script {
- publishE2ETestResult("einheitlicher-ansprechpartner", "Alfa EA E2E-Tests")
- }
- }
+ }
+ }
+ post {
+ failure {
+ script {
+ FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
+ }
+ }
+ always {
+ script {
+ publishE2ETestResult("einheitlicher-ansprechpartner", "Alfa EA E2E-Tests")
}
}
+ }
+ }
- stage('E2E-Main') {
- when {
- expression { EXECUTE_MAIN }
- }
- steps {
- catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
- script {
- def bezeichner = env.MAIN_BEZEICHNER
- def dbPort = 27019
+ stage('E2E-Main') {
+ when {
+ expression { EXECUTE_MAIN && (!SKIP_RUN && !UPDATE_NAMESPACE) }
+ }
+ steps {
+ catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+ script {
+ def bezeichner = env.MAIN_BEZEICHNER
+ def dbPort = 27019
- forwardServices(generateNamespace(bezeichner), dbPort)
+ forwardServices(generateNamespace(bezeichner), dbPort)
- runTests(bezeichner, 'main-tests', dbPort, env.STAGE_NAME)
- }
- }
+ runTests(bezeichner, 'main-tests', dbPort, env.STAGE_NAME)
}
- post {
- failure {
- script {
- FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
- }
- }
- always {
- script {
- publishE2ETestResult("main-tests", "Alfa Main E2E-Tests")
- }
- }
+ }
+ }
+ post {
+ failure {
+ script {
+ FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
+ }
+ }
+ always {
+ script {
+ publishE2ETestResult("main-tests", "Alfa Main E2E-Tests")
}
}
}
@@ -267,9 +257,9 @@ def cloneGitopsRepo() {
}
Void updateGoofyToCurrentMaster() {
- def goofyValues = getApplicationValues('goofy');
- def imageTag = getImageTag(goofyValues);
- def helmVersion = getHelmVersion(goofyValues);
+ def values = getApplicationValues('goofy');
+ def imageTag = getImageTag(values);
+ def helmVersion = getHelmVersion(values);
def eaNamespace = generateNamespace(EA_BEZEICHNER);
updateNamespaceYaml(eaNamespace, imageTag, helmVersion);
@@ -280,7 +270,7 @@ Void updateGoofyToCurrentMaster() {
dir("gitops") {
sh "git add dev/namespace/namespaces/${eaNamespace}.yaml";
sh "git add dev/namespace/namespaces/${mainNamespace}.yaml";
- sh "git commit -m 'update static e2e namespaces(goofy to master version)'";
+ sh "git commit -m 'update static e2e namespaces(alfa to master version)'";
}
}
@@ -338,17 +328,17 @@ Void publishE2ETestResult(String reportFolder, String reportName) {
}
String runTests(String bezeichner, String reportFolder, Integer dbPort, String stageName) {
- def configFile = generateCypressConfig(bezeichner, reportFolder, dbPort)
+ def config = generateCypressConfig(bezeichner, reportFolder, dbPort)
try {
- dir("alfa") {
+ dir('goofy-client') {
sh "npm run cypress:version"
- sh "npm run cypress:ci-run --CONFIG_FILE=${configFile} --REPORT_FOLDER=${reportFolder}"
+ sh "apps/goofy-e2e/run-tests.sh ${reportFolder} ${config}"
}
} catch (Exception e) {
printNpmDebugLog()
- error("Fehler in Stage ${stageName}")
+ error("Fehler in Stage ${stageName}, Exception: ${e}")
}
}
@@ -357,7 +347,7 @@ Void printNpmDebugLog() {
sh "cat /root/.npm/_logs/*-debug.log"
}
else {
- echo "Npm debug log not found"
+ echo 'Npm debug log not found'
}
}
@@ -387,19 +377,21 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
dir('alfa/apps/alfa-e2e/'){
def config = readJSON file: 'cypress-ci.json'
- def plutoDatabaseSecret = getPlutoDatabaseSecret(namespace);
+ def plutoDatabaseSecret = getPlutoDatabaseSecret(namespace);
+ def decodedPassword = decodeString(plutoDatabaseSecret.password);
+ def parsablePassword = makePasswordUrlConform(decodedPassword);
config.baseUrl = "https://${bezeichner}.${env.CLUSTER_BASE_URL}" as String
- config.env.dbUrl = "mongodb://pluto-database-user:${decodeString(plutoDatabaseSecret.password)}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String
+ config.env.dbUrl = "mongodb://${decodeString(plutoDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String
config.env.keycloakUrl = "https://${env.SSO_URL}/" as String
config.env.keycloakRealm = namespace as String
- config.env.keycloakClient = "alfa" as String
- config.env.sabineUuid = getKeycloakUuid(namespace, "sabine") as String
- config.integrationFolder = "./src/integration/${testFolder}" as String
+ config.env.sabineUuid = getKeycloakUuid(namespace, "sabine") as String
config.videosFolder = "./reports/${testFolder}/videos" as String
- config.screenshotsFolder = "./reports/${testFolder}/screenshots" as String
+ config.screenshotsFolder = "./reports/${testFolder}/screenshots" as String
config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String
+ config.specPattern = "src/e2e/${testFolder}/**/*.cy.{js,jsx,ts,tsx}" as String
+
config.env.put("search", getElasticsearchEnv(namespace))
config.env.put("userManager", getUserManagerEnv(namespace, dbPort))
@@ -408,28 +400,35 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
sh "cat ${configName}"
}
- return configName
+ return "cypress-ci-"+testFolder+".config.ts"
}
Map getPlutoDatabaseSecret(String namespace) {
- return readJSON ( text: sh (script: "kubectl get secret pluto-database-admin-pluto-database-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+ return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-pluto-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
}
Map getUserManagerEnv(String namespace, dbPort){
- def plutoDatabaseUserManagerSecret = getPlutoDatabaseUserManagerSecret(namespace);
+ def userManagerDatabaseSecret = getUserManagerDatabaseSecret(namespace);
+ def decodedPassword = decodeString(userManagerDatabaseSecret.password);
+ def parsablePassword = makePasswordUrlConform(decodedPassword);
+
return [
- "dbUrl": "mongodb://user-manager-database-user:${decodeString(plutoDatabaseUserManagerSecret.password)}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String,
+ "dbUrl": "mongodb://${decodeString(userManagerDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String,
"database": "user-manager-database"
- ]
+ ]
}
-Map getPlutoDatabaseUserManagerSecret(String namespace) {
- return readJSON ( text: sh (script: "kubectl get secret pluto-database-admin-user-manager-database-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+Map getUserManagerDatabaseSecret(String namespace) {
+ return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+}
+
+String makePasswordUrlConform(String password) {
+ return sh (script: "printf %s ${password} | jq -sRr @uri", returnStdout: true);
}
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'
"""
@@ -444,12 +443,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() {
@@ -521,7 +529,7 @@ Boolean isElasticSearchForwarded() {
}
Void forwardDatenbank(String namespace, port) {
- sh "kubectl port-forward pluto-database-0 ${port}:27017 -n ${namespace} &"
+ sh "kubectl port-forward ozg-mongodb-0 ${port}:27017 -n ${namespace} &"
}
String generateNamespace(String bezeichner) {
diff --git a/goofy-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-list/vorgang-list-ea.search.cy.ts b/goofy-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-list/vorgang-list-ea.search.cy.ts
index 794a5b38c568da9083ede296490c7b8babca2682..e753289cf8df60048d4c9b95252634660b947490 100644
--- a/goofy-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-list/vorgang-list-ea.search.cy.ts
+++ b/goofy-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-list/vorgang-list-ea.search.cy.ts
@@ -32,7 +32,7 @@ import { enterWith, exist, notExist } from '../../../support/cypress.util';
import { UserRoleE2E, loginAsEmil } from '../../../support/user-util';
import { buildVorgang, createVorgang, initSearchIndex, initVorgaenge, objectIds } from '../../../support/vorgang-util';
-describe('VorgangList Suche for EA User', () => {
+describe.skip('VorgangList Suche for EA User', () => {
const mainPage: MainPage = new MainPage();
const vorgangList: VorgangListE2EComponent = mainPage.getVorgangList();
const header: HeaderE2EComponent = mainPage.getHeader();
diff --git a/goofy-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-assign-unassign.cy.ts b/goofy-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-assign-unassign.cy.ts
index 4acfd38edd15da225ef10614c795af3357ebc5d3..daae4eceacc15588224c14da013481fbc2ab6a20 100644
--- a/goofy-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-assign-unassign.cy.ts
+++ b/goofy-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-assign-unassign.cy.ts
@@ -166,7 +166,7 @@ describe('User Profile im ausgewählten Vorgang', () => {
notExist(userProfileContainer.getSearchContainer().getError());
})
- it('should show assign icon', { defaultCommandTimeout: 30000 }, () => {
+ it.skip('should show assign icon', { defaultCommandTimeout: 30000 }, () => {
waitForSpinnerToDisappear();
// TODO Hier muss aufs Verarbeiten im Backend gewartet werden - oder: wait(500)
wait(500);
diff --git a/goofy-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-by-role.cy.ts b/goofy-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-by-role.cy.ts
index 8c004c5d6ef46f38349f24af6eddb415a74df4c7..7ea89a07c1fea3eebdff6f8997f6d6fa3cb40730 100644
--- a/goofy-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-by-role.cy.ts
+++ b/goofy-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-by-role.cy.ts
@@ -165,7 +165,7 @@ describe('Vorgang Detailansicht by role', () => {
})
})
- describe('for user with role ' + UserRoleE2E.VERWALTUNG_POSTSTELLE, () => {
+ describe.skip('for user with role ' + UserRoleE2E.VERWALTUNG_POSTSTELLE, () => {
before(() => {
initVorgang(vorgang);
diff --git a/goofy-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedervorlage-loading.cy.ts b/goofy-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedervorlage-loading.cy.ts
index b17362f7fa18241082a662f5b62a99e4e1661815..d9c6a2709786399b5fada7f5271771a60e071277 100644
--- a/goofy-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedervorlage-loading.cy.ts
+++ b/goofy-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedervorlage-loading.cy.ts
@@ -89,7 +89,7 @@ describe('Vorgang wiedervorlage loading', () => {
})
})
- describe('Vorgang without wiedervorlagen', () => {
+ describe.skip('Vorgang without wiedervorlagen', () => {
it('should show vorgang detail by click on vorgang in list', () => {
vorgangList.getListItem(vorgangWithOtherWiedervorlagen.name).getRoot().click();
diff --git a/goofy-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage-attachment/wiedervorlage-attachment.cy.ts b/goofy-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage-attachment/wiedervorlage-attachment.cy.ts
index 36c47a0217b1bff2bb5cfab2968daaa9f13ec4c5..7e5e973f7746cc760f882208cb3dfccb2635b038 100644
--- a/goofy-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage-attachment/wiedervorlage-attachment.cy.ts
+++ b/goofy-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage-attachment/wiedervorlage-attachment.cy.ts
@@ -175,7 +175,7 @@ describe('Wiedervorlage attachments', () => {
})
})
- describe('Delete attachment', () => {
+ describe.skip('Delete attachment', () => {
const wiedervorlageComp: WiedervorlageInVorgangE2EComponent = wiedervorlageContainerInVorgang.getWiedervorlage(WIEDERVORLAGE_WITH_ATTACHMENTS_BETREFF);
@@ -214,7 +214,7 @@ describe('Wiedervorlage attachments', () => {
})
})
- describe('switch to wiedervorlage without attachments', () => {
+ describe.skip('switch to wiedervorlage without attachments', () => {
const wiedervorlageComp: WiedervorlageInVorgangE2EComponent = wiedervorlageContainerInVorgang.getWiedervorlage(wiedervorlage.betreff);
@@ -229,7 +229,7 @@ describe('Wiedervorlage attachments', () => {
})
})
- describe('Same number of attachments after status change', () => {
+ describe.skip('Same number of attachments after status change', () => {
const wiedervorlageComp: WiedervorlageInVorgangE2EComponent = wiedervorlageContainerInVorgang.getWiedervorlage(WIEDERVORLAGE_WITH_ATTACHMENTS_BETREFF);
it('should open wiedervorlage page', () => {
@@ -278,7 +278,7 @@ describe('Wiedervorlage attachments', () => {
})
})
- describe('delete last attachment', () => {
+ describe.skip('delete last attachment', () => {
it('should remove on delete', () => {
attachmentList.getItem(TEST_FILE_WITH_CONTENT).getDeleteButton().click();
diff --git a/goofy-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage/wiedervorlage.erledigen.cy.ts b/goofy-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage/wiedervorlage.erledigen.cy.ts
index 9215c049ba3e68944e32db5cc64f7f2fd868a78c..25597cdc6b4612e418c46ae484fcb31e757dd797 100644
--- a/goofy-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage/wiedervorlage.erledigen.cy.ts
+++ b/goofy-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage/wiedervorlage.erledigen.cy.ts
@@ -41,7 +41,7 @@ import { loginAsSabine } from '../../../support/user-util';
import { createVorgang, initVorgang, objectIds } from '../../../support/vorgang-util';
import { createWiedervorlageAttachedItem, createWiedervorlageItem } from '../../../support/wiedervorlage-util';
-describe('Wiedervorlage erledigen/wiedereroeffnen', () => {
+describe.skip('Wiedervorlage erledigen/wiedereroeffnen', () => {
const mainPage: MainPage = new MainPage();
const views: VorgangViewsE2EComponent = mainPage.getViews();
diff --git a/goofy-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml b/goofy-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
index 7309e8956d032edc74a5bfd5ff2a499dbe09306d..24540910a742ce8c680c70a8a33a2ead1b795a8f 100644
--- a/goofy-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
+++ b/goofy-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
@@ -25,7 +25,7 @@ vorgang-manager:
env:
overrideSpringProfiles: "oc,e2e,dev"
elasticsearch:
- enabled: true
+ enabled: false
password: "Test3456!"
replicaCount: 1
ozgcloud:
@@ -50,7 +50,6 @@ user_manager:
serverUrl: https://sso.dev.by.ozg-cloud.de
api_user:
name: usermanagerapiuser
- password: ApiUser123!
first_name: UserManager
last_name: ApiUser
realm_roles:
@@ -68,7 +67,7 @@ user_manager:
className: openshift-default
smocker:
- enabled: true
+ enabled: false
mocks:
- request:
diff --git a/goofy-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml b/goofy-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
index fd7eca2a10689e9303e7711e3cc45019205f9467..4bb08d8692675304ae1557eafe14a1909ef9733b 100644
--- a/goofy-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
+++ b/goofy-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
@@ -16,8 +16,8 @@ alfa:
use_staging_cert: true
className: openshift-default
baseUrl: dev.by.ozg-cloud.de
-
-vorgang-manager:
+
+pluto:
env:
overrideSpringProfiles: "oc,e2e,dev"
elasticsearch:
@@ -46,7 +46,6 @@ user_manager:
serverUrl: https://sso.dev.by.ozg-cloud.de
api_user:
name: usermanagerapiuser
- password: ApiUser123!
first_name: UserManager
last_name: ApiUser
realm_roles:
@@ -64,7 +63,7 @@ user_manager:
className: openshift-default
smocker:
- enabled: true
+ enabled: false
mocks:
- request: