X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=4a0b86dd9d7a59aaf646047df333232f47a5b8ee;hb=bb7e436d45bc54d8747f65fc2d602f42b28fe38c;hp=71209df05af8f1b727dbba50ce48404f69bd2113;hpb=9ff44dfa77e955e8b99213c62d0cefc195fcaf11;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 71209df0..4a0b86dd 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -31,7 +31,8 @@ onap-branch: - 'dublin': nordix-branch: master - onap-version: 4.0.0-ONAP + onap-version: dublin + onap-flavor: full engine-version: master engine-refspec: master deploy-scenario-version: master @@ -40,6 +41,7 @@ - 'master': nordix-branch: master onap-version: master + onap-flavor: full engine-version: master engine-refspec: master deploy-scenario-version: master @@ -50,17 +52,21 @@ - ubuntu1804 deploy-scenario: - - onap-oom-nofeature + - 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 @@ -82,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 @@ -105,6 +111,13 @@ name: ONAP_VERSION default: '{onap-version}' description: 'ONAP version to deploy' + - string: + name: ONAP_FLAVOR + default: '{onap-flavor}' + 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-{deploy-scenario}-{onap-branch}-{onap-flavor}' - string: name: ENGINE_VERSION default: '{engine-version}' @@ -121,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 @@ -137,8 +161,13 @@ option: project wrappers: + - credentials-binding: + - file: + 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 @@ -153,12 +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 @@ -168,6 +200,8 @@ 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 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -177,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 @@ -194,6 +228,8 @@ 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 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -208,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 @@ -220,6 +256,8 @@ 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 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -230,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 @@ -242,6 +280,8 @@ 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 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -252,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 @@ -264,6 +304,8 @@ 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 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION @@ -274,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 @@ -286,6 +328,8 @@ 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 @@ -300,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 @@ -311,6 +355,8 @@ 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 XTESTING_REPO_URL=$XTESTING_REPO_URL @@ -331,11 +377,13 @@ - NOT_BUILT - UNSTABLE build-steps: + - shell: + !include-raw-escape: ./wait-for-pkg-manager.sh - shell: !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 @@ -350,6 +398,10 @@ branch: '{nordix-branch}' - nordix-gerrit-parameters - onap-parameter-macro + - string: + name: ONAP_FLAVOR + default: '{onap-flavor}' + description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.' - string: name: ONAP_VERSION default: '{onap-version}' @@ -358,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: @@ -375,11 +427,11 @@ builders: - description-setter: - description: $INSTALLER_TYPE $DEPLOY_SCENARIO + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR - '{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 @@ -414,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: @@ -435,7 +491,7 @@ builders: - description-setter: - description: $INSTALLER_TYPE $DEPLOY_SCENARIO + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR - 'onap-healthcheck-macro' # vim: set ts=2 sw=2 expandtab: