From aca27a6ba352694e9e83fd809933a1314860484c Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 30 Jul 2019 21:10:32 +0200 Subject: [PATCH] Fix onap-parameters macro Change-Id: Ide9745d121bb49d39be0309ce0cd8a45ec746e97 --- .../cloud-infra-periodic-onap.yaml | 44 +++++++++++++++++++ jjb/cloud-infra/onap-macros.yaml | 32 +++----------- 2 files changed, 50 insertions(+), 26 deletions(-) diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml index 781e57bb..169aa233 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -111,6 +111,26 @@ parameters: - onap-parameter-macro + - string: + name: ONAP_VERSION + default: '{onap-version}' + description: 'ONAP version to deploy' + - 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.' + - 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.' properties: - logrotate @@ -343,6 +363,10 @@ parameters: - onap-parameter-macro + - string: + name: ONAP_VERSION + default: '{onap-version}' + description: 'ONAP version to deploy' wrappers: - credentials-binding: @@ -379,6 +403,26 @@ parameters: - onap-parameter-macro + - string: + name: ONAP_VERSION + default: '{onap-version}' + description: 'ONAP version to deploy' + - 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.' + - 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.' wrappers: - credentials-binding: diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml index 27860e82..9ff14254 100644 --- a/jjb/cloud-infra/onap-macros.yaml +++ b/jjb/cloud-infra/onap-macros.yaml @@ -28,36 +28,32 @@ - nordix-gerrit-parameters - label: name: SLAVE_LABEL - default: '{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: '{distro}' + default: 'ubuntu1804' 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-oom-nofeature' 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' - - string: - name: ONAP_VERSION - default: '{onap-version}' - description: 'ONAP version to deploy' - string: name: ONAP_FLAVOR default: 'full' @@ -66,22 +62,6 @@ 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.' - - 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.' - string: name: XTESTING_REPO_URL default: 'https://gerrit.nordix.org/opnfv/xtesting-onap.git' -- 2.25.1