diff --git a/Jenkinsfile.admin b/Jenkinsfile.admin
index e361112618597808cba0a9d55d2bdd89091042fe..5737e7bcceb6dbb9cfcf07e0d088a3b7807e36ca 100644
--- a/Jenkinsfile.admin
+++ b/Jenkinsfile.admin
@@ -1,7 +1,7 @@
pipeline {
agent {
node {
- label 'ozgcloud-jenkins-build-agent'
+ label 'ozgcloud-jenkins-build-agent-jdk21-node20'
}
}
@@ -23,14 +23,14 @@ pipeline {
stage('Check Version') {
steps {
script {
- FAILED_STAGE = env.STAGE_NAME
- dir('alfa-client') {
+ FAILED_STAGE = env.STAGE_NAME
+ dir('alfa-client') {
VERSION = getPackagejsonVersion()
}
}
}
}
-
+
stage('build admin client and its docker image') {
steps {
script {
@@ -85,9 +85,9 @@ pipeline {
dir('alfa-client/apps/admin') {
sh "./run_helm_test.sh"
- }
+ }
- dir('alfa-client/apps/admin/src/main/helm') {
+ dir('alfa-client/apps/admin/src/main/helm') {
sh "helm package --version=${HELM_CHART_VERSION} ."
@@ -130,9 +130,9 @@ pipeline {
}
}
- post {
+ post {
failure {
- script {
+ script {
if (isMasterBranch() || isReleaseBranch()) {
sendFailureMessage()
}
diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e
index 8d4455ba9f7a363efe2d0850d88b00473c1e27db..5699110fb2ce69d798ea6c6bc242df298b9a941d 100644
--- a/alfa-client/Jenkinsfile.e2e
+++ b/alfa-client/Jenkinsfile.e2e
@@ -245,13 +245,13 @@ pipeline {
}
}
- stage('Run E2E-Tests') {
- when {
- expression { !SKIP_RUN }
- }
- failFast false
+ //stage('Run E2E-Tests') {
+ // when {
+ // expression { !SKIP_RUN }
+ // }
+ // failFast false
- parallel {
+ // parallel {
stage('E2E-Alfa-EA') {
when {
expression { !SKIP_RUN }
@@ -343,8 +343,8 @@ pipeline {
}
}
}
- }
- }
+ // }
+ //}
stage('Delete E2E Namespaces') {
when {
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts
index 2770d0fb9d618c8e139b9cf4131ec33c9667869c..51f7b9f39c2a513bba610db9e81113a53411dfd4 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts
@@ -92,16 +92,6 @@ describe('ExterneFachstelleContainerComponent', () => {
});
});
- describe('ngOnDestroy', () => {
- it('should call hideForm', () => {
- component.hideForm = jest.fn();
-
- component.ngOnDestroy();
-
- expect(component.hideForm).toHaveBeenCalled();
- });
- });
-
describe('hideForm', () => {
it('should call service to hide form', () => {
component.hideForm();
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.ts
index 025455d739cbe39f5ac2fa96aa751eb73042c31a..7142d51e93dc900e0990d2c343aae66389b4e516 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.ts
@@ -27,10 +27,6 @@ export class ExterneFachstelleContainerComponent {
this.isFormVisible$ = this.service.isExterneFachstelleFormVisible();
}
- ngOnDestroy(): void {
- this.hideForm();
- }
-
public hideForm(): void {
this.service.hideExterneFachstelleForm();
this.formService.reset();
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.spec.ts
index db074ea7b2b912cf078df24749c72831b6935ba7..6184b6fdb3a36d7404160df9ce3005e9bc42eea6 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.spec.ts
@@ -92,16 +92,6 @@ describe('OrganisationsEinheitContainerComponent', () => {
});
});
- describe('ngOnDestroy', () => {
- it('should call hideForm', () => {
- component.hideForm = jest.fn();
-
- component.ngOnDestroy();
-
- expect(component.hideForm).toHaveBeenCalled();
- });
- });
-
describe('hideForm', () => {
it('should call service to hide form', () => {
component.hideForm();
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.ts
index 4a76dd254321135bd414b66efc13e5c80f276574..5f37c98675989f56a1d8219db29f55edf90681b3 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.ts
@@ -1,6 +1,6 @@
import { CollaborationListResource } from '@alfa-client/collaboration-shared';
import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
import { CollaborationService } from 'libs/collaboration-shared/src/lib/collaboration.service';
import { Observable } from 'rxjs';
import { CollaborationRequestFormService } from '../../collaboration-request-form/collaboration.request.formservice';
@@ -10,7 +10,7 @@ import { CollaborationRequestFormService } from '../../collaboration-request-for
templateUrl: './organisations-einheit-container.component.html',
providers: [CollaborationRequestFormService],
})
-export class OrganisationsEinheitContainerComponent implements OnInit, OnDestroy {
+export class OrganisationsEinheitContainerComponent implements OnInit {
@Input() public vorgang: VorgangWithEingangResource;
@Input() public collaborationListResource: CollaborationListResource;
@@ -27,10 +27,6 @@ export class OrganisationsEinheitContainerComponent implements OnInit, OnDestroy
this.isFormVisible$ = this.service.isOrganisationsEinheitFormVisible();
}
- ngOnDestroy(): void {
- this.hideForm();
- }
-
public hideForm(): void {
this.service.hideOrganisationseinheitForm();
this.formService.reset();
diff --git a/alfa-server/src/main/resources/application-e2e.yml b/alfa-server/src/main/resources/application-e2e.yml
index 69d9b46a198e57b5d03f01cc78f2d83e209f9335..fd8c68442dd1afef3e6dc9f76d2932e0d7b2fc58 100644
--- a/alfa-server/src/main/resources/application-e2e.yml
+++ b/alfa-server/src/main/resources/application-e2e.yml
@@ -1,8 +1,3 @@
-logging:
- level:
- '[de.ozgcloud]': INFO
- config: classpath:log4j2-local.xml
-
keycloak:
realm: by-e2e-local-dev