X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-engine.yaml;fp=jjb%2Fcloud-infra%2Fcloud-infra-periodic-engine.yaml;h=cbd866eda8b64779eb02f3a8cf8ed0928815717a;hb=aaf958440c8721300e03ed5e6b88d488b6e63fad;hp=2291089ae414cd27f46f3536242d68dc05ac766f;hpb=4d320cb2565204e8e6ee5b5f406bd364dfc74932;p=infra%2Fcicd.git diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml index 2291089a..cbd866ed 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml @@ -60,7 +60,10 @@ dib_os_element: 'centos-minimal' type: - - virtual + - virtual: + slave-label: 'vpod-deploy-city' + - baremetal: + slave-label: 'baremetal-deploy' phase: - deploy @@ -93,6 +96,10 @@ name: DISTRIBUTION default: '{distribution}' description: 'Distribution to use for configuring target nodes (networking etc.)' + - string: + name: DEPLOY_TYPE + default: '{type}' + description: 'Type of the deployment' - string: name: USE_PREBUILT_DEPLOYMENT_IMAGE default: 'true' @@ -160,6 +167,7 @@ current-parameters: true predefined-parameters: | DISTRIBUTION=$DISTRIBUTION + DEPLOY_TYPE=$DEPLOY_TYPE USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT DIB_OS_RELEASE=$DIB_OS_RELEASE @@ -178,6 +186,7 @@ current-parameters: true predefined-parameters: | DISTRIBUTION=$DISTRIBUTION + DEPLOY_TYPE=$DEPLOY_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE CLEANUP=$CLEANUP @@ -192,6 +201,7 @@ current-parameters: true predefined-parameters: | DISTRIBUTION=$DISTRIBUTION + DEPLOY_TYPE=$DEPLOY_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO TEST_SUITE=$TEST_SUITE CLEANUP=$CLEANUP @@ -217,6 +227,10 @@ name: DISTRIBUTION default: 'ubuntu18' description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.' + - string: + name: DEPLOY_TYPE + default: 'virtual' + description: 'Type of the deployment. Overriden by upstream job.' - string: name: USE_PREBUILT_DEPLOYMENT_IMAGE default: 'false'