X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=558e6725c6777bce83324a7d8751ab507f5a8578;hb=32d163c49ae9e62c08844fe88f9a3ee9eb118a9e;hp=fd2a6b7fe7ac875e274057a2effbbaeb3e05e8d7;hpb=39b91e0029b36de00b546613b8cf0da33151d2a5;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 fd2a6b7f..558e6725 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -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 @@ -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 @@ -214,7 +221,7 @@ description: $DEPLOY_SCENARIO | $ONAP_FLAVOR - shell: | #!/bin/bash - sudo /bin/rm -rf /tmp/openrc && sudo /bin/cp -f $OPENRC_FILE /tmp/openrc + /bin/rm -rf /tmp/openrc && /bin/cp -f $OPENRC_FILE /tmp/openrc - multijob: name: Deploy ONAP using OOM condition: ALWAYS @@ -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 @@ -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: @@ -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