X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=488dc81719fc8da33585f6b1c55dc580d9dffe6f;hb=refs%2Fchanges%2F69%2F2069%2F1;hp=4c659a937682f806bbf714c41ac9ae76ed6cce09;hpb=9c661b6edf9d33fb07d998bf2440c0e92a43109e;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 4c659a93..488dc817 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -31,7 +31,7 @@ onap-branch: - 'dublin': nordix-branch: master - onap-version: 4.0.0-ONAP + onap-version: dublin onap-flavor: full engine-version: master engine-refspec: master @@ -54,15 +54,19 @@ deploy-scenario: - onap-nofeature-noha + ci-loop: + - daily + 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 @@ -84,12 +88,12 @@ test-type: onap-healthcheck jobs: - - '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}' - - '{onap-other-phases}-periodic-{distro}-{installer-type}-{type}-{onap-branch}' - - '{onap-healthcheck-phases}-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - '{deploy-scenario}-{onap-flavor}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - '{onap-other-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' + - '{onap-healthcheck-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' - job-template: - name: '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + name: '{deploy-scenario}-{onap-flavor}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' project-type: multijob @@ -130,6 +134,17 @@ 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.' + - choice: + name: DELETE_STACK + choices: + - 'yes' + - 'no' + default: 'yes' + description: 'Development purposes only! Whether delete the stack or not. Default is yes. Setting this to no will increase the cost!' properties: - logrotate @@ -148,11 +163,11 @@ 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 @@ -167,15 +182,15 @@ builders: - description-setter: - description: $INSTALLER_TYPE | $DEPLOY_SCENARIO + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR - shell: | #!/bin/bash cp $OPENRC_FILE /tmp/openrc - multijob: name: Deploy ONAP using OOM - condition: SUCCESSFUL + condition: ALWAYS projects: - - name: 'onap-deploy-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'onap-deploy-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | DISTRO=$DISTRO @@ -185,6 +200,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 @@ -195,13 +211,13 @@ CLEANUP=$CLEANUP git-revision: true node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true + kill-phase-on: NEVER + abort-all-job: false - multijob: name: K8S and OOM Healthcheck using xtesting condition: ALWAYS projects: - - name: 'oom-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'oom-healthcheck-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | DISTRO=$DISTRO @@ -212,6 +228,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 @@ -227,7 +244,7 @@ name: ONAP Healthcheck using xtesting condition: ALWAYS projects: - - name: 'onap-healthcheck-core-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'onap-healthcheck-core-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL @@ -239,6 +256,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 @@ -250,7 +268,7 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false - - name: 'onap-healthcheck-small-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'onap-healthcheck-small-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL @@ -262,6 +280,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 @@ -273,7 +292,7 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false - - name: 'onap-healthcheck-medium-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'onap-healthcheck-medium-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL @@ -285,6 +304,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 @@ -296,7 +316,7 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false - - name: 'onap-healthcheck-full-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'onap-healthcheck-full-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | SLAVE_LABEL=$SLAVE_LABEL @@ -308,6 +328,7 @@ 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 @@ -323,7 +344,7 @@ name: Promote ONAP (not activated) condition: ALWAYS projects: - - name: 'promote-onap-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'promote-onap-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' current-parameters: false predefined-parameters: | DISTRO=$DISTRO @@ -334,6 +355,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 @@ -361,7 +383,7 @@ !include-raw: ./delete-heat-stack.sh - job-template: - name: '{onap-other-phases}-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + name: '{onap-other-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' disabled: false @@ -388,7 +410,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: @@ -409,7 +431,7 @@ - '{onap-other-phases}-macro' - job-template: - name: '{onap-healthcheck-phases}-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + name: '{onap-healthcheck-phases}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}' disabled: false @@ -444,11 +466,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: