X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=6badee1cbbd59ee59c1d83f36bae719a15ea4d0d;hb=f548cf5f3a50b1ab3f67e1cdefb3c4f6f7144dd4;hp=8d4ed14b06ecdfe08613f5ed130a99602dd92acf;hpb=6c7ccc3431be30d7a7e9f55b6383223a54c6f934;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 8d4ed14b..6badee1c 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' - daily-trigger: '@midnight' + 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: @@ -128,6 +128,10 @@ 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}' @@ -139,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" @@ -179,7 +186,7 @@ block-level: 'NODE' - throttle: max-per-node: 1 - max-total: 3 + max-total: 1 option: project wrappers: @@ -189,7 +196,7 @@ variable: OPENRC_FILE - mask-passwords - build-timeout: - timeout: 300 + timeout: 630 - fix-workspace-permissions - openstack: single-use: True @@ -210,7 +217,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 @@ -219,6 +226,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 @@ -227,6 +235,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 @@ -247,6 +256,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 @@ -256,6 +266,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 @@ -277,6 +288,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 @@ -286,6 +298,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 @@ -302,6 +315,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 @@ -311,6 +325,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 @@ -327,6 +342,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 @@ -336,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,6 +369,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 @@ -361,6 +379,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 @@ -377,6 +396,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 @@ -386,6 +406,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 @@ -406,6 +427,7 @@ 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 @@ -415,6 +437,7 @@ 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 @@ -461,6 +484,10 @@ 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' @@ -483,14 +510,19 @@ 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: @@ -502,7 +534,7 @@ builders: - description-setter: - description: $DEPLOY_SCENARIO | $ONAP_FLAVOR + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER - '{onap-other-phases}-macro' - job-template: @@ -525,6 +557,10 @@ 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' @@ -563,10 +599,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}' @@ -582,7 +614,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: