X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=71209df05af8f1b727dbba50ce48404f69bd2113;hb=9ff44dfa77e955e8b99213c62d0cefc195fcaf11;hp=781e57bb05ea6591057830e40d311a4be94d5df7;hpb=d6f228bea02de4cfdd5ae34794123c26e87a1ffe;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 781e57bb..71209df0 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -19,20 +19,8 @@
 # ============LICENSE_END=========================================================
 
 #--------------------------------------------------------------------------------------
-# The jobs declared in this JJB configuration file are used for verifying cloud-infra
-# engine from the tip of the master branch periodically to check the stability of it.
-#
-# These jobs are set to run on slaves with label vpod-deploy-ubuntu1604.
-# The slaves have
-#   - Ubuntu1604 as the base distro
-#   - nested virtualization
-#   - internet access
-#   - passwordless sudo
-#   - 16 CPUs/32GB RAM/200 GB Disk
-#   - docker, git vim curl wget zip unzip chrony apt-transport-https ca-certificates curl
-#     gnupg-agent software-properties-common docker-ce docker-ce-cli containerd.io openjdk-8-jre
-#
-# The slaves should not have a cloud infra scenario deployed on them.
+# The jobs declared in this JJB configuration file are used for deploying and testing
+# ONAP scenario onap-nofeature-noha.
 #--------------------------------------------------------------------------------------
 
 - project:
@@ -45,9 +33,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,7 +44,7 @@
           engine-refspec: master
           deploy-scenario-version: master
           deploy-scenario-refspec: master
-          disabled: true
+          disabled: false
 
     distro:
       - ubuntu1804
@@ -78,8 +66,6 @@
           test-type: oom-healthcheck
       - promote-onap:
           build-timeout: 5
-      - delete-stack:
-          build-timeout: 5
 
     onap-healthcheck-phases:
       - onap-healthcheck-core:
@@ -110,7 +96,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 +140,8 @@
       - build-timeout:
           timeout: 220
       - fix-workspace-permissions
+      - openstack:
+          single-use: True
 
     scm:
       - git-scm:
@@ -307,29 +319,20 @@
               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
-                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
+
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - ABORTED
+                - NOT_BUILT
+                - UNSTABLE
+              build-steps:
+                - shell:
+                    !include-raw: ./delete-heat-stack.sh
 
 - job-template:
     name: '{onap-other-phases}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
@@ -342,7 +345,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 +389,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: