Add more details for phases in onap-oom-nofeature job

[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 dd812fb24a1912ade4a427d1bd17e7e25329919e..68369b7e16d801b6f97ed7daff14462e3cbf1200 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -83,6 +83,8 @@
           test-type: onap-healthcheck
       - promote-onap:
           build-timeout: 5
+      - delete-stack:
+          build-timeout: 5
 
     jobs:
       - '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
@@ -198,7 +200,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}'
@@ -223,7 +225,7 @@
               kill-phase-on: FAILURE
               abort-all-job: true
       - multijob:
-          name: OOM Healthcheck xtesting
+          name: Kubernetes and OOM Healthcheck using xtesting
           condition: ALWAYS
           projects:
             - name: 'oom-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
@@ -248,7 +250,7 @@
               kill-phase-on: NEVER
               abort-all-job: false
       - multijob:
-          name: ONAP Healthcheck xtesting
+          name: ONAP Healthcheck using xtesting (core, small, medium, and full functionality)
           condition: ALWAYS
           projects:
             - name: 'onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
@@ -340,7 +342,7 @@
               kill-phase-on: NEVER
               abort-all-job: false
       - multijob:
-          name: Promote ONAP
+          name: Promote ONAP (not activated)
           condition: ALWAYS
           projects:
             - name: 'promote-onap-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
@@ -362,6 +364,29 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
+      - multijob:
+          name: Cleanup
+          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
 
 - job-template:
     name: '{phase}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'