X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=b967fc2d2f61e928790655dc42925b0ced3e974f;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=d52496a63a88f9aaedd11f4dc9ee2929b2627af6;hpb=3131a534939067f0a308bb8e1f915591cd8c99d5;p=infra%2Fcicd.git diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml index d52496a6..b967fc2d 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -30,7 +30,7 @@ cloud: - city: - slave-label: 'city-jumphost-ubuntu1804' + slave-label: 'engine-jumphost-online-ubuntu1804' openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap' daily-trigger: '@midnight' - xerces: @@ -48,7 +48,7 @@ deploy-scenario: 'onap-nofeature-noha' deploy-scenario-version: master deploy-scenario-refspec: master - disabled: false + disabled: true delete-stack: 'yes' - 'master': nordix-branch: master @@ -59,8 +59,8 @@ deploy-scenario: 'onap-nofeature-noha' deploy-scenario-version: master deploy-scenario-refspec: master - disabled: false - delete-stack: 'no' + disabled: true + delete-stack: 'yes' distro: - ubuntu1804 @@ -119,7 +119,7 @@ project: '{project}' branch: '{nordix-branch}' - nordix-gerrit-parameters - - onap-parameter-macro + - onap-parameter-macro-legacy - label: name: SLAVE_LABEL default: '{slave-label}' @@ -143,6 +143,9 @@ - string: name: STACK_NAME default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}' + - string: + name: KEYPAIR_NAME + default: 'keypair-nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}' - string: name: HEAT_ENVIRONMENT_FILENAME default: "heat-environment-{cloud}-{distro}-full.yaml" @@ -177,9 +180,13 @@ - build-blocker: use-build-blocker: true blocking-jobs: + - 'cloud-infra-verify-engine-.*' + - 'cloud-infra-verify-scenario-.*' - 'cloud-infra-periodic-engine-.*' - 'onap-.*' - 'k8-.*' + - 'os-.*' + - 'nolabs-.*' block-level: 'NODE' - throttle: max-per-node: 1 @@ -232,6 +239,7 @@ ONAP_FLAVOR=$ONAP_FLAVOR POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -239,7 +247,6 @@ DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP git-revision: true node-parameters: true kill-phase-on: NEVER @@ -262,6 +269,7 @@ TEST_TYPE=oom-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -269,7 +277,6 @@ DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -293,6 +300,7 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -300,7 +308,6 @@ DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -319,6 +326,7 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -326,7 +334,6 @@ DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -345,6 +352,7 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -352,7 +360,6 @@ DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -371,6 +378,7 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -378,7 +386,6 @@ DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -397,6 +404,7 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -404,7 +412,6 @@ DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -427,12 +434,12 @@ ENGINE_REFSPEC=$ENGINE_REFSPEC POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME + KEYPAIR_NAME=$KEYPAIR_NAME HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS - CLEANUP=$CLEANUP node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -468,7 +475,7 @@ project: '{project}' branch: '{nordix-branch}' - nordix-gerrit-parameters - - onap-parameter-macro + - onap-parameter-macro-legacy - label: name: SLAVE_LABEL default: 'xerces-jumphost-onap-ubuntu1804' @@ -495,7 +502,7 @@ description: 'Type of the deployment' - string: name: HEAT_ENVIRONMENT_FILE - default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME" + default: "file:///opt/engine/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME" description: 'Type of the deployment' wrappers: @@ -524,7 +531,7 @@ builders: - description-setter: description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER - - '{onap-other-phases}-macro' + - '{onap-other-phases}-macro-legacy' - job-template: name: '{onap-healthcheck-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' @@ -541,7 +548,7 @@ project: '{project}' branch: '{nordix-branch}' - nordix-gerrit-parameters - - onap-parameter-macro + - onap-parameter-macro-legacy - label: name: SLAVE_LABEL default: 'xerces-jumphost-onap-ubuntu1804' @@ -564,7 +571,7 @@ description: 'Type of the deployment' - string: name: HEAT_ENVIRONMENT_FILE - default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME" + default: "file:///opt/engine/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME" description: 'Type of the deployment' - string: name: ENGINE_VERSION @@ -604,6 +611,6 @@ builders: - description-setter: description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER - - 'onap-healthcheck-macro' + - 'onap-healthcheck-macro-legacy' # vim: set ts=2 sw=2 expandtab: