Rename onap-oom-nofeature scenario to onap-nofeature-noha

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-periodic-onap.yaml

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 781e57bb05ea6591057830e40d311a4be94d5df7..1e98c2157cb8cc0c2d1219ba5bba0d68ef1b69e6 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -45,9 +45,9 @@
           nordix-branch: master
           onap-version: 4.0.0-ONAP
           engine-version: master
-          engine-refspec: "refs/changes/71/1771/4"
-          deploy-scenario-version: "9a215b7935ab2b14cc7451ba15ea575e62e26da7"
-          deploy-scenario-refspec: "refs/changes/65/1765/12"
+          engine-refspec: master
+          deploy-scenario-version: master
+          deploy-scenario-refspec: master
           disabled: false
       - 'master':
           nordix-branch: master
@@ -56,13 +56,13 @@
           engine-refspec: master
           deploy-scenario-version: master
           deploy-scenario-refspec: master
-          disabled: true
+          disabled: false
 
     distro:
       - ubuntu1804
 
     deploy-scenario:
-      - onap-oom-nofeature
+      - onap-nofeature-noha
 
     type:
       - cloud:
@@ -110,7 +110,31 @@
     concurrent: true
 
     parameters:
+      - project-parameters:
+          project: '{project}'
+          branch: '{nordix-branch}'
+      - nordix-gerrit-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
@@ -130,6 +154,8 @@
       - build-timeout:
           timeout: 220
       - fix-workspace-permissions
+      - openstack:
+          single-use: True
 
     scm:
       - git-scm:
@@ -342,7 +368,15 @@
       - logrotate
 
     parameters:
+      - project-parameters:
+          project: '{project}'
+          branch: '{nordix-branch}'
+      - nordix-gerrit-parameters
       - onap-parameter-macro
+      - string:
+          name: ONAP_VERSION
+          default: '{onap-version}'
+          description: 'ONAP version to deploy'
 
     wrappers:
       - credentials-binding:
@@ -378,7 +412,31 @@
       - logrotate
 
     parameters:
+      - project-parameters:
+          project: '{project}'
+          branch: '{nordix-branch}'
+      - nordix-gerrit-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: