X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=4af1d400e135dc0145643452b09904701c6a90cd;hb=fc0bd715212a172c15c143142f44af1fc029f9f2;hp=68c5c5b5547bfea09bd5a5771a2994429e091a17;hpb=76c4bd93acb50e0930829a07b43ed20797766076;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 68c5c5b5..4af1d400 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -30,18 +30,18 @@ cloud: - city: - slave-label: 'city-jumphost-onap-ubuntu1804' - openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap' + slave-label: 'city-jumphost-ubuntu1804' + openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap' daily-trigger: '@midnight' - xerces: - slave-label: 'xerces-jumphost-onap-ubuntu1804' + slave-label: 'xerces-jumphost-ubuntu1804' openrc-credentials-file: 'est-estinfra-openrcfile-xerces-lund-onap' daily-trigger: '#@midnight' onap-branch: - - 'dublin': + - 'elalto': nordix-branch: master - onap-version: dublin + onap-version: elalto onap-flavor: full engine-version: master engine-refspec: master @@ -60,7 +60,7 @@ deploy-scenario-version: master deploy-scenario-refspec: master disabled: false - delete-stack: 'no' + delete-stack: 'yes' distro: - ubuntu1804 @@ -81,7 +81,7 @@ build-timeout: 30 test-type: oom-healthcheck - promote-onap: - build-timeout: 5 + build-timeout: 240 onap-healthcheck-phases: - onap-hc-core: @@ -112,7 +112,7 @@ disabled: '{obj:disabled}' - concurrent: true + concurrent: false parameters: - project-parameters: @@ -120,6 +120,18 @@ branch: '{nordix-branch}' - nordix-gerrit-parameters - onap-parameter-macro + - label: + name: SLAVE_LABEL + default: '{slave-label}' + description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use' + - string: + name: DISTRO + default: '{distro}' + description: 'Distribution to use for configuring target nodes (networking etc.)' + - string: + name: OPENSTACK_CLOUD_PROVIDER + default: '{cloud}' + description: 'Name of the cloud where this job is run' - string: name: ONAP_VERSION default: '{onap-version}' @@ -132,8 +144,11 @@ name: STACK_NAME default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}' - string: - name: HEAT_ENVIRONMENT_FILE - default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/heat-environment-{cloud}-{distro}-full.yaml" + 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" description: 'Type of the deployment' - string: name: ENGINE_VERSION @@ -165,13 +180,17 @@ - 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 - max-total: 3 + max-total: 1 option: project wrappers: @@ -181,7 +200,7 @@ variable: OPENRC_FILE - mask-passwords - build-timeout: - timeout: 300 + timeout: 630 - fix-workspace-permissions - openstack: single-use: True @@ -202,7 +221,7 @@ description: $DEPLOY_SCENARIO | $ONAP_FLAVOR - shell: | #!/bin/bash - cp $OPENRC_FILE /tmp/openrc + /bin/rm -rf /tmp/openrc && /bin/cp -f $OPENRC_FILE /tmp/openrc - multijob: name: Deploy ONAP using OOM condition: ALWAYS @@ -211,6 +230,7 @@ current-parameters: false predefined-parameters: | DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER DEPLOY_TYPE=$DEPLOY_TYPE PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE @@ -219,7 +239,8 @@ ONAP_FLAVOR=$ONAP_FLAVOR POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -239,6 +260,7 @@ current-parameters: false predefined-parameters: | DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER DEPLOY_TYPE=$DEPLOY_TYPE PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE @@ -248,7 +270,8 @@ TEST_TYPE=oom-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -269,6 +292,7 @@ predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -278,7 +302,8 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -294,6 +319,7 @@ predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -303,7 +329,8 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -319,6 +346,7 @@ predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -328,7 +356,8 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -344,6 +373,7 @@ predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -353,7 +383,8 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -369,6 +400,7 @@ predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -378,7 +410,8 @@ TEST_TYPE=onap-healthcheck POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + KEYPAIR_NAME=$KEYPAIR_NAME + HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -396,7 +429,9 @@ - name: 'promote-onap-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | + SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO + OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER DEPLOY_TYPE=$DEPLOY_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO @@ -406,7 +441,8 @@ ENGINE_REFSPEC=$ENGINE_REFSPEC POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + 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 @@ -448,6 +484,18 @@ branch: '{nordix-branch}' - nordix-gerrit-parameters - onap-parameter-macro + - label: + name: SLAVE_LABEL + default: 'xerces-jumphost-onap-ubuntu1804' + description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use' + - string: + name: OPENSTACK_CLOUD_PROVIDER + default: 'city' + description: 'Name of the cloud where this job is run' + - string: + name: DISTRO + default: 'ubuntu1804' + description: 'Distribution to use for configuring target nodes (networking etc.)' - string: name: ONAP_FLAVOR default: '{onap-flavor}' @@ -456,20 +504,29 @@ name: ONAP_VERSION default: '{onap-version}' description: 'ONAP version to deploy' + - string: + name: HEAT_ENVIRONMENT_FILENAME + default: "heat-environment-full.yaml" + 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-full.yaml" + 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: - - credentials-binding: - - file: - credential-id: est-jenkins-openrcfile-city-karlskrona-onap - variable: OPENRC_FILE - mask-passwords - build-timeout: timeout: '{build-timeout}' - fix-workspace-permissions + - credentials-binding: + - username-password-separated: + credential-id: 'nordix-cicd-arm-credentials' + username: NORDIX_ARM_USERNAME + password: NORDIX_ARM_TOKEN + - username-password-separated: + credential-id: 'nordix-cicd-harbor-credentials' + username: NORDIX_HARBOR_USERNAME + password: NORDIX_HARBOR_PASSWORD scm: - git-scm: @@ -481,7 +538,7 @@ builders: - description-setter: - description: $DEPLOY_SCENARIO | $ONAP_FLAVOR + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER - '{onap-other-phases}-macro' - job-template: @@ -500,13 +557,29 @@ branch: '{nordix-branch}' - nordix-gerrit-parameters - onap-parameter-macro + - label: + name: SLAVE_LABEL + default: 'xerces-jumphost-onap-ubuntu1804' + description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use' + - string: + name: OPENSTACK_CLOUD_PROVIDER + default: 'city' + description: 'Name of the cloud where this job is run' + - string: + name: DISTRO + default: 'ubuntu1804' + description: 'Distribution to use for configuring target nodes (networking etc.)' - string: name: ONAP_VERSION default: '{onap-version}' description: 'ONAP version to deploy' + - string: + name: HEAT_ENVIRONMENT_FILENAME + default: "heat-environment-full.yaml" + 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-full.yaml" + 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 @@ -530,10 +603,6 @@ description: 'Development purposes only! Set to none for disabling test results DB reporting.' wrappers: - - credentials-binding: - - file: - credential-id: est-jenkins-openrcfile-city-karlskrona-onap - variable: OPENRC_FILE - mask-passwords - build-timeout: timeout: '{build-timeout}' @@ -549,7 +618,7 @@ builders: - description-setter: - description: $DEPLOY_SCENARIO | $ONAP_FLAVOR + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER - 'onap-healthcheck-macro' # vim: set ts=2 sw=2 expandtab: