X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-macros.yaml;h=8129201e9ed675e4f741e9bd6ec0d08d2326d590;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=27860e82682544a3dd2c0ba3dc6358a1856e0658;hpb=d6f228bea02de4cfdd5ae34794123c26e87a1ffe;p=infra%2Fcicd.git diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml index 27860e82..8129201e 100644 --- a/jjb/cloud-infra/onap-macros.yaml +++ b/jjb/cloud-infra/onap-macros.yaml @@ -18,70 +18,79 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= -# macros used by all job types +# macros used by all job types on cloud - parameter: - name: 'onap-parameter-macro' + name: 'onap-parameter-macro-legacy' parameters: - - project-parameters: - 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}' + default: 'heat' description: 'Provisioner to use for provisioning nodes' - string: name: INSTALLER_TYPE - default: '{installer-type}' + default: 'kubespray' description: 'Installer to use for deploying the scenario' - string: name: DEPLOY_SCENARIO - default: '{deploy-scenario}' + default: 'onap-nofeature-noha' description: 'Scenario to deploy and test' - string: name: DEPLOY_TYPE - default: '{type}' + default: 'cloud' description: 'Type of the deployment' - 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' + name: TEST_TYPE + default: 'oom-healthcheck' + description: 'Test type to run. Could be oom-healthcheck or onap-healthcheck' + - string: + name: NORDIX_ARM_REPO_URL + default: 'https://artifactory.nordix.org/artifactory' + description: 'URL to Nordix Artifactory' - string: - name: ONAP_VERSION - default: '{onap-version}' - description: 'ONAP version to deploy' + name: NORDIX_HARBOR_REPO_URL + default: 'registry.nordix.org' + description: 'URL to Nordix Harbor' - string: - name: ONAP_FLAVOR - default: 'full' - description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.' + 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.' + +# macros used by all job types on baremetal +- parameter: + name: 'onap-baremetal-parameter-macro-legacy' + parameters: + - string: + name: PROVISIONER_TYPE + default: 'bifrost' + 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-nofeature-noha' + description: 'Scenario to deploy and test' + - string: + name: DEPLOY_TYPE + default: 'baremetal' + description: 'Type of the deployment' - string: name: TEST_TYPE default: 'oom-healthcheck' description: 'Test type to run. Could be oom-healthcheck or onap-healthcheck' - string: - name: ENGINE_VERSION - 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: '{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: '{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.' + name: NORDIX_ARM_REPO_URL + default: 'https://artifactory.nordix.org/artifactory' + description: 'URL to Nordix Artifactory' - string: - 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.' + name: NORDIX_HARBOR_REPO_URL + default: 'registry.nordix.org' + description: 'URL to Nordix Harbor' - string: name: XTESTING_REPO_URL default: 'https://gerrit.nordix.org/opnfv/xtesting-onap.git' @@ -90,12 +99,9 @@ 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' + - builder: - name: 'onap-deploy-macro' + name: 'onap-deploy-macro-legacy' builders: - shell: !include-raw: ./wait-for-pkg-manager.sh @@ -103,27 +109,41 @@ !include-raw: ./onap-deploy.sh - builder: - name: 'oom-healthcheck-macro' + name: 'onap-deploy-baremetal-macro-legacy' + builders: + - shell: + !include-raw: ./wait-for-pkg-manager.sh + - shell: + !include-raw: ./onap-deploy-baremetal.sh + +- builder: + name: 'oom-hc-macro-legacy' builders: - shell: !include-raw: ./oom-healthcheck.sh - builder: - name: 'onap-healthcheck-macro' + name: 'oom-hc-baremetal-macro-legacy' + builders: + - shell: + !include-raw: ./oom-healthcheck.sh + +- builder: + name: 'onap-healthcheck-macro-legacy' builders: - shell: !include-raw: ./onap-healthcheck.sh - builder: - name: 'promote-onap-macro' + name: 'onap-healthcheck-baremetal-macro-legacy' builders: - shell: - !include-raw: ./promote-onap.sh + !include-raw: ./onap-healthcheck.sh - builder: - name: 'delete-stack-macro' + name: 'promote-onap-macro-legacy' builders: - shell: - !include-raw: ./delete-stack.sh + !include-raw: ./promote-onap.sh # vim: set ts=2 sw=2 expandtab: