From 52c037c97b745bf2636386d27e975a32f3959420 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 5 Jul 2023 09:07:56 +0200 Subject: [PATCH] Update jenkins stage1 and stage2 to fix setting of VM flavor for OSM installation Change-Id: I33a8b01cd47dbeea2d05473365dbe7c18c050b86 Signed-off-by: garciadeblas --- jenkins/ci-pipelines/ci_stage_1.groovy | 1 + jenkins/ci-pipelines/ci_stage_2.groovy | 1 + 2 files changed, 2 insertions(+) diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy index 4daee3a3..b2360696 100644 --- a/jenkins/ci-pipelines/ci_stage_1.groovy +++ b/jenkins/ci-pipelines/ci_stage_1.groovy @@ -68,6 +68,7 @@ node("${params.NODE}") { string(name: 'GERRIT_PATCHSET_REVISION', value: GERRIT_PATCHSET_REVISION), string(name: 'INSTALLER', value: params.INSTALLER), string(name: 'OPENSTACK_BASE_IMAGE', value: params.OPENSTACK_BASE_IMAGE), + string(name: 'OPENSTACK_OSM_FLAVOR'. value: params.OPENSTACK_OSM_FLAVOR), 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), diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy index 13714b90..6722e47b 100644 --- a/jenkins/ci-pipelines/ci_stage_2.groovy +++ b/jenkins/ci-pipelines/ci_stage_2.groovy @@ -267,6 +267,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa string(name: 'GERRIT_BRANCH', value: "${branch}"), string(name: 'INSTALLER', value: "Default" ), string(name: 'OPENSTACK_BASE_IMAGE', value: "ubuntu22.04" ), + 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 ) -- 2.25.1