From 31e83ba21fc3a44ae145430ecaba3ce7199aecc8 Mon Sep 17 00:00:00 2001 From: caviedesj Date: Thu, 8 Jan 2026 18:33:54 +0100 Subject: [PATCH] Feature 11077. Adjust Jenkinsfile.new Tests stages to be identical to LCM Change-Id: I5977dc2466120d3dc0fa8762bcb18067bb07c4e9 Signed-off-by: caviedesj --- Jenkinsfile.new | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile.new b/Jenkinsfile.new index aee6a1d5..0b2e6da9 100644 --- a/Jenkinsfile.new +++ b/Jenkinsfile.new @@ -13,7 +13,6 @@ limitations under the License. */ -def ciHelper def DEFAULT_MODULE_NAME = 'mon' pipeline { @@ -126,17 +125,22 @@ pipeline { } } - stage('Unit Tests') { + stage('Tests') { steps { script { - if (!ciHelper) { - ciHelper = load 'devops/jenkins/ci-pipelines/ci_helper.groovy' - } def UID = sh(returnStdout: true, script: 'id -u').trim() def GID = sh(returnStdout: true, script: 'id -g').trim() def common = "-v ${env.WORKSPACE}:/tests -e UID=${UID} -e GID=${GID} " + (params.DOCKER_ARGS ?: '') - stage('Test') { + stage('Linting Tests') { + sh """ + docker run --rm ${common} \ + ${env.TEST_IMAGE} \ + /tests/devops-stages/stage-lint.sh + """ + } + + stage('Unit Tests') { sh """ docker run --rm ${common} \ ${env.TEST_IMAGE} \ @@ -253,9 +257,11 @@ pipeline { Promotion should be done in a separate downstream job after E2E success to avoid */ } + post { always { - cleanWs() + // cleanWs() + deleteDir() } } } -- 2.25.1