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) } }) diff --git a/Jenkinsfile-msvc2017 b/Jenkinsfile-msvc2017 index e3033ad39..036f6bc2a 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_nopython(target, target_dir) })