From c9ea6ad7758f6d3517f58f8f9fac1f930781a70b Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 27 Nov 2023 18:50:12 +0100 Subject: [PATCH] Update Jenkins stage 1 and 2 files to enable new params so that they land in stage 3 Change-Id: I3c7353662d2b1c3937ec30e92d38a8f193c4a861 Signed-off-by: garciadeblas --- jenkins/ci-pipelines/ci_stage_1.groovy | 2 ++ jenkins/ci-pipelines/ci_stage_2.groovy | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy index 021e6487..17345ea8 100644 --- a/jenkins/ci-pipelines/ci_stage_1.groovy +++ b/jenkins/ci-pipelines/ci_stage_1.groovy @@ -72,6 +72,8 @@ node("${params.NODE}") { string(name: 'PROJECT_URL_PREFIX', value: params.PROJECT_URL_PREFIX), string(name: 'DOCKER_TAG', value: params.DOCKER_TAG), booleanParam(name: 'TEST_INSTALL', value: params.TEST_INSTALL), + booleanParam(name: 'TRY_JUJU_INSTALLATION', value: params.TRY_JUJU_INSTALLATION), + booleanParam(name: 'TRY_OLD_SERVICE_ASSURANCE', value: params.TRY_OLD_SERVICE_ASSURANCE), ] if ( params.DO_ROBOT ) { diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy index 6722e47b..146a16f0 100644 --- a/jenkins/ci-pipelines/ci_stage_2.groovy +++ b/jenkins/ci-pipelines/ci_stage_2.groovy @@ -270,7 +270,9 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa string(name: 'OPENSTACK_OSM_FLAVOR', value: "osm.sanity" ), string(name: 'UPSTREAM_JOB_NAME', value: "${JOB_NAME}" ), string(name: 'UPSTREAM_JOB_NUMBER', value: "${BUILD_NUMBER}" ), - booleanParam(name: 'DO_STAGE_4', value: do_stage_4 ) + booleanParam(name: 'DO_STAGE_4', value: do_stage_4 ), + booleanParam(name: 'TRY_JUJU_INSTALLATION', value: false), + booleanParam(name: 'TRY_OLD_SERVICE_ASSURANCE', value: false), ] stage_3_job = "osm-stage_3" if ( JOB_NAME.contains('merge') ) { -- 2.17.1