From 43c07e9de386c7040e4982e2e991ae14f17afd59 Mon Sep 17 00:00:00 2001 From: klayoutmatthias Date: Sat, 17 Dec 2022 23:59:19 +0100 Subject: [PATCH 1/3] Updating Jenkinsfile-msvc2017 --- Jenkinsfile-msvc2017 | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile-msvc2017 b/Jenkinsfile-msvc2017 index e3033ad39..89a2735f8 100644 --- a/Jenkinsfile-msvc2017 +++ b/Jenkinsfile-msvc2017 @@ -22,10 +22,8 @@ node("master") { stage("Building target ${target}") { - withDockerContainer(image: "jenkins-${target}") { - // from shared library - build(target, target_dir) - } + // from shared library + build(target, target_dir) } @@ -43,19 +41,15 @@ node("master") { "Unit testing": { ut_result = "no-result" - withDockerContainer(image: "jenkins-${target}") { - ut_result = run_ut(target) - } + ut_result = run_ut(target) junit(testResults: ut_result) }, "Installtest": { - withDockerContainer(image: "jenkins-${target}-basic") { - // from shared library - installtest(target, target_dir) - } + // from shared library + installtest(target, target_dir) }) From 781e9a7e263596badc0242f66620ee164cfd61d8 Mon Sep 17 00:00:00 2001 From: klayoutmatthias Date: Sun, 18 Dec 2022 01:13:08 +0100 Subject: [PATCH 2/3] Turning off Python module test --- Jenkinsfile-msvc2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-msvc2017 b/Jenkinsfile-msvc2017 index 89a2735f8..036f6bc2a 100644 --- a/Jenkinsfile-msvc2017 +++ b/Jenkinsfile-msvc2017 @@ -49,7 +49,7 @@ node("master") { "Installtest": { // from shared library - installtest(target, target_dir) + installtest_nopython(target, target_dir) }) From b7b26b7ecd1859773361004d3aba52ba87d4be58 Mon Sep 17 00:00:00 2001 From: klayoutmatthias Date: Sun, 18 Dec 2022 01:16:46 +0100 Subject: [PATCH 3/3] Turning off Python module test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e3033ad39..03bf27089 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,7 +54,7 @@ node("master") { withDockerContainer(image: "jenkins-${target}-basic") { // from shared library - installtest(target, target_dir) + installtest_nopython(target, target_dir) } })