X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=f1996122b2afbdc4ceb12be1bb69d996c863f30b;hb=68c9c79b9ad904d2a74ad43c7bbb9c6e65dea9ed;hp=22387dfdc86975b3538a7dfc645acef961320817;hpb=0d4647558f0eaea1b7dc1a8c2028d9425ef7c2d9;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 22387dfd..f1996122 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -44,7 +44,6 @@ - 'dublin': nordix-branch: master onap-version: 4.0.0-ONAP - onap-flavor: full engine-version: master engine-refspec: master deploy-scenario-version: master @@ -53,12 +52,11 @@ - 'master': nordix-branch: master onap-version: master - onap-flavor: full engine-version: master engine-refspec: master deploy-scenario-version: master deploy-scenario-refspec: master - disabled: true + disabled: false distro: - ubuntu1804 @@ -72,32 +70,35 @@ installer-type: kubespray slave-label: 'jumphost-onap-ubuntu1804' - phase: + onap-other-phases: - onap-deploy: build-timeout: 150 - flavor: - - full - oom-healthcheck: build-timeout: 30 test-type: oom-healthcheck - flavor: - - full - - onap-healthcheck: - build-timeout: 30 - test-type: onap-healthcheck - flavor: - - core - - small - - medium - - full - promote-onap: build-timeout: 5 - flavor: - - full + - delete-stack: + build-timeout: 5 + + onap-healthcheck-phases: + - onap-healthcheck-core: + build-timeout: 30 + test-type: onap-healthcheck + - onap-healthcheck-small: + build-timeout: 30 + test-type: onap-healthcheck + - onap-healthcheck-medium: + build-timeout: 30 + test-type: onap-healthcheck + - onap-healthcheck-full: + build-timeout: 30 + test-type: onap-healthcheck jobs: - '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}' - - 'xtesting-{phase}-{flavor}-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}' - job-template: name: '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}' @@ -113,46 +114,11 @@ project: '{project}' branch: '{nordix-branch}' - nordix-gerrit-parameters - - 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: PROVISIONER_TYPE - default: '{provisioner-type}' - description: 'Provisioner to use for provisioning nodes' - - string: - name: INSTALLER_TYPE - default: '{installer-type}' - description: 'Installer to use for deploying the scenario' - - string: - name: DEPLOY_SCENARIO - default: '{deploy-scenario}' - description: 'Scenario to deploy and test' - - string: - name: HEAT_ENVIRONMENT_FILE - default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/heat-environment-full.yaml" - description: 'Type of the deployment' - - string: - name: DEPLOY_TYPE - default: '{type}' - description: 'Type of the deployment' + - onap-parameter-macro - string: 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: ENGINE_REPO_URL - default: 'https://gerrit.nordix.org/infra/engine.git' - description: 'URL to Nordix cloud-infra/engine repository' - string: name: ENGINE_VERSION default: '{engine-version}' @@ -169,18 +135,6 @@ 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: XTESTING_REPO_URL - default: 'https://gerrit.nordix.org/opnfv/xtesting-onap.git' - description: 'URL to Nordix xtesting-onap repository' - - string: - name: ENGINE_ANSIBLE_PARAMS - default: '' - description: 'Extra parameters that can be added when run the play books.' - - string: - name: CLEANUP - default: 'true' - description: 'Cleanup leftovers of the previous run' properties: - logrotate @@ -200,6 +154,8 @@ - build-timeout: timeout: 220 - fix-workspace-permissions + - openstack: + single-use: True scm: - git-scm: @@ -213,7 +169,7 @@ - description-setter: description: $INSTALLER_TYPE | $DEPLOY_SCENARIO - multijob: - name: Deploy ONAP + name: Deploy ONAP using OOM condition: SUCCESSFUL projects: - name: 'onap-deploy-periodic-{distro}-{installer-type}-{type}-{onap-branch}' @@ -221,10 +177,9 @@ predefined-parameters: | DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=$ONAP_FLAVOR ENGINE_VERSION=$ENGINE_VERSION @@ -239,16 +194,15 @@ kill-phase-on: FAILURE abort-all-job: true - multijob: - name: OOM Healthcheck - condition: SUCCESSFUL + name: K8S and OOM Healthcheck using xtesting + condition: ALWAYS projects: - - name: 'xtesting-oom-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'oom-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}' current-parameters: false predefined-parameters: | DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO ONAP_VERSION=$ONAP_VERSION @@ -265,18 +219,18 @@ kill-phase-on: NEVER abort-all-job: false - multijob: - name: ONAP Healthcheck - Core - condition: SUCCESSFUL + name: ONAP Healthcheck using xtesting + condition: ALWAYS projects: - - name: 'xtesting-onap-healthcheck-core-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'onap-healthcheck-core-periodic-{distro}-{installer-type}-{type}-{onap-branch}' current-parameters: false predefined-parameters: | + SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO - DEPLOY_TYPE=$DEPLOY_TYPE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + DEPLOY_TYPE=$DEPLOY_TYPE ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=core TEST_TYPE=onap-healthcheck @@ -284,25 +238,21 @@ ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC - ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS 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 Healthcheck - Small - condition: SUCCESSFUL - projects: - - name: 'xtesting-onap-healthcheck-small-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'onap-healthcheck-small-periodic-{distro}-{installer-type}-{type}-{onap-branch}' current-parameters: false predefined-parameters: | + SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO - DEPLOY_TYPE=$DEPLOY_TYPE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + DEPLOY_TYPE=$DEPLOY_TYPE ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=small TEST_TYPE=onap-healthcheck @@ -310,25 +260,21 @@ ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC - ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS 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 Healthcheck - Medium - condition: SUCCESSFUL - projects: - - name: 'xtesting-onap-healthcheck-medium-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'onap-healthcheck-medium-periodic-{distro}-{installer-type}-{type}-{onap-branch}' current-parameters: false predefined-parameters: | + SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO - DEPLOY_TYPE=$DEPLOY_TYPE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + DEPLOY_TYPE=$DEPLOY_TYPE ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=medium TEST_TYPE=onap-healthcheck @@ -336,25 +282,21 @@ ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC - ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS 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 Healthcheck - Full - condition: SUCCESSFUL - projects: - - name: 'onap-healthcheck-periodic-full-{distro}-{installer-type}-{type}-{onap-branch}' + - name: 'onap-healthcheck-full-periodic-{distro}-{installer-type}-{type}-{onap-branch}' current-parameters: false predefined-parameters: | + SLAVE_LABEL=$SLAVE_LABEL DISTRO=$DISTRO - DEPLOY_TYPE=$DEPLOY_TYPE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + DEPLOY_TYPE=$DEPLOY_TYPE ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=full TEST_TYPE=onap-healthcheck @@ -362,7 +304,6 @@ ENGINE_REFSPEC=$ENGINE_REFSPEC DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC - ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS XTESTING_REPO_URL=$XTESTING_REPO_URL ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS CLEANUP=$CLEANUP @@ -370,15 +311,37 @@ kill-phase-on: NEVER abort-all-job: false - multijob: - name: Promote ONAP - condition: SUCCESSFUL + name: Promote ONAP (not activated) + condition: ALWAYS projects: - name: 'promote-onap-periodic-{distro}-{installer-type}-{type}-{onap-branch}' current-parameters: false predefined-parameters: | DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE + INSTALLER_TYPE=$INSTALLER_TYPE + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + ONAP_VERSION=$ONAP_VERSION + ONAP_FLAVOR=$ONAP_FLAVOR + 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 + - multijob: + name: Delete Stack + condition: ALWAYS + projects: + - name: 'delete-stack-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + current-parameters: false + predefined-parameters: | + DISTRO=$DISTRO + DEPLOY_TYPE=$DEPLOY_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO ONAP_VERSION=$ONAP_VERSION @@ -395,7 +358,7 @@ abort-all-job: false - job-template: - name: 'xtesting-{phase}-{flavor}-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + name: '{onap-other-phases}-periodic-{distro}-{installer-type}-{type}-{onap-branch}' disabled: false @@ -409,73 +372,71 @@ project: '{project}' branch: '{nordix-branch}' - nordix-gerrit-parameters - - label: - name: SLAVE_LABEL - default: 'jumphost-onap-ubuntu1804' - description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use' - - string: - name: DISTRO - default: 'ubuntu1804' - description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.' - - string: - name: PROVISIONER_TYPE - default: 'heat' - description: 'Provisioner to use for provisioning nodes' - - string: - name: INSTALLER_TYPE - default: 'kubespray' - description: 'Installer to use for deploying the scenario' - - string: - name: DEPLOY_SCENARIO - default: 'onap-oom-nofeature' - description: 'Scenario to deploy and test' - - string: - name: HEAT_ENVIRONMENT_FILE - default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/heat-environment-full.yaml" - description: 'Type of the deployment' - - string: - name: DEPLOY_TYPE - default: 'cloud' - description: 'Type of the deployment. Overriden by upstream job.' + - onap-parameter-macro - string: name: ONAP_VERSION - default: 'master' + default: '{onap-version}' description: 'ONAP version to deploy' + + wrappers: + - credentials-binding: + - file: + credential-id: nordix-jenkins-openrcfile-city-frankfurt-defaultproject + variable: OPENRC_FILE + - mask-passwords + - build-timeout: + timeout: '{build-timeout}' + - fix-workspace-permissions + + scm: + - git-scm: + ssh-credentials-id: nordixinfra-nordix-gerrit-ssh + branch: '{nordix-branch}' + refspec: '' + wipe_workspace: true + clean_before: false + + builders: + - description-setter: + description: $INSTALLER_TYPE $DEPLOY_SCENARIO + - '{onap-other-phases}-macro' + +- job-template: + name: '{onap-healthcheck-phases}-periodic-{distro}-{installer-type}-{type}-{onap-branch}' + + disabled: false + + concurrent: true + + properties: + - logrotate + + parameters: + - project-parameters: + project: '{project}' + branch: '{nordix-branch}' + - nordix-gerrit-parameters + - onap-parameter-macro - string: - name: ONAP_FLAVOR - default: '{flavor}' - description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.' - - string: - name: TEST_TYPE - default: 'oom-healthcheck' - description: 'Test type to run. Could be oom-healthcheck or onap-healthcheck' + name: ONAP_VERSION + default: '{onap-version}' + description: 'ONAP version to deploy' - string: name: ENGINE_VERSION - default: 'master' + default: '{engine-version}' description: 'Development purposes only! Nordix Cloud Infra Engine version to use for deploying ONAP. Could be sha, branch' - string: name: ENGINE_REFSPEC - default: 'master' + default: '{engine-refspec}' description: 'Development purposes only! Nordix Cloud Infra Engine version to use for deploying ONAP. Must be refspec.' - string: name: DEPLOY_SCENARIO_VERSION - default: 'master' + default: '{deploy-scenario-version}' description: 'Development purposes only! Nordix Cloud Infra Scenario version to use for deploying ONAP. Depends on DEPLOY_SCENARIO_REFSPEC and could be sha, branch.' - string: name: DEPLOY_SCENARIO_REFSPEC - default: 'master' + 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: XTESTING_REPO_URL - default: 'https://gerrit.nordix.org/opnfv/xtesting-onap.git' - description: 'URL to Nordix xtesting-onap repository' - - string: - name: ENGINE_ANSIBLE_PARAMS - default: '' - description: 'Extra parameters that can be added when run the play books.' - - string: - name: CLEANUP - default: 'true' wrappers: - credentials-binding: @@ -497,7 +458,7 @@ builders: - description-setter: - description: $INSTALLER_TYPE - $DEPLOY_SCENARIO - - '{phase}-macro' + description: $INSTALLER_TYPE $DEPLOY_SCENARIO + - 'onap-healthcheck-macro' # vim: set ts=2 sw=2 expandtab: