From 456bd850c2cb33b3a36e76d1c250d40c61ec1dc1 Mon Sep 17 00:00:00 2001 From: ChristophW Date: Tue, 10 Oct 2023 11:13:06 +0200 Subject: [PATCH 1/4] Use OS independent steps (#80) --- Jenkinsfile.internal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.internal b/Jenkinsfile.internal index 04eea2d9..34602891 100644 --- a/Jenkinsfile.internal +++ b/Jenkinsfile.internal @@ -21,7 +21,7 @@ pipeline { } agent { - label 'windows && docker' + label 'docker' } environment { @@ -49,7 +49,7 @@ pipeline { } stage('Run Container Tests') { steps { - bat './gradlew clean containerTest -Dspock.skip.sandbox=false' + cmd '"./gradlew" clean containerTest -Dspock.skip.sandbox=false' } } } From 8de104749438c423457f335e43e556e31503919c Mon Sep 17 00:00:00 2001 From: ChristophW Date: Tue, 10 Oct 2023 12:04:45 +0200 Subject: [PATCH 2/4] Update branch (#80) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d6475e27..d9911069 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ If the problem still exists search the following list of issues for possible sol ## Compatibility - Jenkins LTS 2.332.3 or higher -- Java SE Runtime Environment 11 or higher +- Java SE Runtime Environment 11 or higher
ECU-TEST/ From 5201ad8ebdbf93ad15a5a9684d28ecd3140f9d7f Mon Sep 17 00:00:00 2001 From: ChristophW Date: Wed, 11 Oct 2023 09:53:43 +0200 Subject: [PATCH 3/4] Avoid systemTest deadlock (#80) --- Jenkinsfile.internal | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile.internal b/Jenkinsfile.internal index 34602891..d375b1dd 100644 --- a/Jenkinsfile.internal +++ b/Jenkinsfile.internal @@ -21,7 +21,7 @@ pipeline { } agent { - label 'docker' + label 'master' } environment { @@ -41,6 +41,9 @@ pipeline { } } stage('Container Tests') { + agent { + label 'docker' + } stages { stage('Prepare Resources') { steps { From 17dc09a90f4ea121e32551c26d928eaad9b76492 Mon Sep 17 00:00:00 2001 From: ChristophW Date: Tue, 17 Oct 2023 15:15:33 +0200 Subject: [PATCH 4/4] Trigger pipeline (#80) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9911069..c4042fbf 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ If the problem still exists search the following list of issues for possible sol > using a containerized version of ECU-TEST, the executing Jenkins agent needs to be within the same container.
-## Compatibility +## Compatibility - Jenkins LTS 2.332.3 or higher - Java SE Runtime Environment 11 or higher