X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=b5fcf9b87dcead96cd5de3a0831788fb154474cd;hb=bbdc834b319d5e78972ceea00894d17f8ff5b20e;hp=8328d94298c84c703eec25909f253a1b19406e79;hpb=da8abf730097845c6532eb7032d3c2058d8c7429;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 8328d942..b5fcf9b8 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -38,6 +38,7 @@ deploy-scenario-version: master deploy-scenario-refspec: master disabled: false + delete-stack: 'yes' - 'master': nordix-branch: master onap-version: master @@ -47,6 +48,7 @@ deploy-scenario-version: master deploy-scenario-refspec: master disabled: false + delete-stack: 'no' distro: - ubuntu1804 @@ -59,13 +61,14 @@ type: - cloud: + pod-name: est-cloud provisioner-type: heat installer-type: kubespray slave-label: 'jumphost-onap-ubuntu1804' onap-other-phases: - onap-deploy: - build-timeout: 150 + build-timeout: 210 - oom-healthcheck: build-timeout: 30 test-type: oom-healthcheck @@ -73,16 +76,19 @@ build-timeout: 5 onap-healthcheck-phases: - - onap-healthcheck-core: + - onap-hc-core: build-timeout: 30 test-type: onap-healthcheck - - onap-healthcheck-small: + - onap-hc-small: build-timeout: 30 test-type: onap-healthcheck - - onap-healthcheck-medium: + - onap-hc-medium: build-timeout: 30 test-type: onap-healthcheck - - onap-healthcheck-full: + - onap-hc-full: + build-timeout: 30 + test-type: onap-healthcheck + - onap-hc-healthdist: build-timeout: 30 test-type: onap-healthcheck @@ -116,7 +122,7 @@ description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.' - string: name: STACK_NAME - default: 'nordix-cicd-onap-{onap-branch}-{onap-flavor}' + default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}' - string: name: ENGINE_VERSION default: '{engine-version}' @@ -133,6 +139,14 @@ name: DEPLOY_SCENARIO_REFSPEC default: '{deploy-scenario-refspec}' description: 'Development purposes only! Nordix Cloud Infra Scenario version to use for deploying ONAP. Depends on DEPLOY_SCENARIO_VERSION and must be refspec.' + - string: + name: POD_NAME + default: '{pod-name}' + description: 'Development purposes only! Set to none for disabling test results DB reporting.' + - string: + name: DELETE_STACK + default: '{delete-stack}' + description: 'Development purposes only! Whether delete the stack or not. It must either be yes or no. Setting this to no will increase the cost!' properties: - logrotate @@ -151,15 +165,18 @@ wrappers: - credentials-binding: - file: - credential-id: nordix-jenkins-openrcfile-city-frankfurt-defaultproject + credential-id: est-jenkins-openrcfile-city-karlskrona-onap variable: OPENRC_FILE - mask-passwords - build-timeout: - timeout: 220 + timeout: 300 - fix-workspace-permissions - openstack: single-use: True + triggers: + - timed: '@midnight' + scm: - git-scm: ssh-credentials-id: nordixinfra-nordix-gerrit-ssh @@ -170,7 +187,7 @@ builders: - description-setter: - description: $INSTALLER_TYPE | $DEPLOY_SCENARIO + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR - shell: | #!/bin/bash cp $OPENRC_FILE /tmp/openrc @@ -188,6 +205,7 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=$ONAP_FLAVOR + POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -204,7 +222,7 @@ name: K8S and OOM Healthcheck using xtesting condition: ALWAYS projects: - - name: 'oom-healthcheck-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - name: 'oom-hc-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | DISTRO=$DISTRO @@ -215,6 +233,7 @@ ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=full TEST_TYPE=oom-healthcheck + POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -230,7 +249,7 @@ name: ONAP Healthcheck using xtesting condition: ALWAYS projects: - - name: 'onap-healthcheck-core-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - name: 'onap-hc-core-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL @@ -242,6 +261,7 @@ ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=core TEST_TYPE=onap-healthcheck + POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -253,7 +273,7 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false - - name: 'onap-healthcheck-small-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - name: 'onap-hc-small-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL @@ -265,6 +285,7 @@ ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=small TEST_TYPE=onap-healthcheck + POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -276,7 +297,7 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false - - name: 'onap-healthcheck-medium-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - name: 'onap-hc-medium-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL @@ -288,6 +309,7 @@ ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=medium TEST_TYPE=onap-healthcheck + POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -299,7 +321,7 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false - - name: 'onap-healthcheck-full-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - name: 'onap-hc-full-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL @@ -311,6 +333,31 @@ ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=full TEST_TYPE=onap-healthcheck + POD_NAME=$POD_NAME + STACK_NAME=$STACK_NAME + ENGINE_VERSION=$ENGINE_VERSION + ENGINE_REFSPEC=$ENGINE_REFSPEC + 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 + - name: 'onap-hc-healthdist-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + current-parameters: false + predefined-parameters: | + SLAVE_LABEL=$SLAVE_LABEL + DISTRO=$DISTRO + PROVISIONER_TYPE=$PROVISIONER_TYPE + INSTALLER_TYPE=$INSTALLER_TYPE + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DEPLOY_TYPE=$DEPLOY_TYPE + ONAP_VERSION=$ONAP_VERSION + ONAP_FLAVOR=healthdist + TEST_TYPE=onap-healthcheck + POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC @@ -337,6 +384,7 @@ ONAP_FLAVOR=$ONAP_FLAVOR ENGINE_VERSION=$ENGINE_VERSION ENGINE_REFSPEC=$ENGINE_REFSPEC + POD_NAME=$POD_NAME STACK_NAME=$STACK_NAME DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC @@ -391,7 +439,7 @@ wrappers: - credentials-binding: - file: - credential-id: nordix-jenkins-openrcfile-city-frankfurt-defaultproject + credential-id: est-jenkins-openrcfile-city-karlskrona-onap variable: OPENRC_FILE - mask-passwords - build-timeout: @@ -447,11 +495,15 @@ name: DEPLOY_SCENARIO_REFSPEC default: '{deploy-scenario-refspec}' description: 'Development purposes only! Nordix Cloud Infra Scenario version to use for deploying ONAP. Depends on DEPLOY_SCENARIO_VERSION and must be refspec.' + - string: + name: POD_NAME + default: '{pod-name}' + description: 'Development purposes only! Set to none for disabling test results DB reporting.' wrappers: - credentials-binding: - file: - credential-id: nordix-jenkins-openrcfile-city-frankfurt-defaultproject + credential-id: est-jenkins-openrcfile-city-karlskrona-onap variable: OPENRC_FILE - mask-passwords - build-timeout: