X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=7afaf1db05db61b499a958c1aa3a91f68a97e17f;hb=refs%2Fchanges%2F25%2F1825%2F2;hp=133d44c61981efd2fcfc55563fa922328eda6c17;hpb=c1a528ca8a202b61997d56e09b8d204f05e3715f;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 133d44c6..7afaf1db 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -46,9 +46,9 @@
           onap-version: 4.0.0-ONAP
           onap-flavor: full
           engine-version: master
-          engine-refspec: master
-          deploy-scenario-version: master
-          deploy-scenario-refspec: master
+          engine-refspec: "refs/changes/71/1771/4"
+          deploy-scenario-version: "9a215b7935ab2b14cc7451ba15ea575e62e26da7"
+          deploy-scenario-refspec: "refs/changes/65/1765/12"
           disabled: false
       - 'master':
           nordix-branch: master
@@ -83,10 +83,12 @@
           test-type: onap-healthcheck
       - promote-onap:
           build-timeout: 5
+      - delete-stack:
+          build-timeout: 5
 
     jobs:
       - '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
-      - 'xtesting-{phase}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+      - '{phase}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
 
 - job-template:
     name: '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
@@ -122,10 +124,6 @@
           name: DEPLOY_SCENARIO
           default: '{deploy-scenario}'
           description: 'Scenario to deploy and test'
-      - 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: DEPLOY_TYPE
           default: '{type}'
@@ -210,10 +208,9 @@
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
-                PROVISIIONER_TYPE=$PROVISIIONER_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=$ONAP_FLAVOR
                 ENGINE_VERSION=$ENGINE_VERSION
@@ -228,16 +225,15 @@
               kill-phase-on: FAILURE
               abort-all-job: true
       - multijob:
-          name: OOM Healthcheck
+          name: OOM Healthcheck xtesting
           condition: ALWAYS
           projects:
-            - name: 'xtesting-oom-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'oom-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
-                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
-                PROVISIIONER_TYPE=$PROVISIIONER_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 ONAP_VERSION=$ONAP_VERSION
@@ -254,18 +250,17 @@
               kill-phase-on: NEVER
               abort-all-job: false
       - multijob:
-          name: ONAP Healthcheck
+          name: ONAP Healthcheck xtesting
           condition: ALWAYS
           projects:
-            - name: 'xtesting-onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
-                PROVISIIONER_TYPE=$PROVISIIONER_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=core
                 TEST_TYPE=onap-healthcheck
@@ -280,15 +275,14 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-            - name: 'xtesting-onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
-                PROVISIIONER_TYPE=$PROVISIIONER_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=small
                 TEST_TYPE=onap-healthcheck
@@ -303,15 +297,14 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-            - name: 'xtesting-onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
-                PROVISIIONER_TYPE=$PROVISIIONER_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=medium
                 TEST_TYPE=onap-healthcheck
@@ -331,10 +324,9 @@
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
-                PROVISIIONER_TYPE=$PROVISIIONER_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=full
                 TEST_TYPE=onap-healthcheck
@@ -358,7 +350,29 @@
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
-                HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE
+                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
+      - multijob:
+          name: Cleanup
+          condition: ALWAYS
+          projects:
+            - name: 'delete-stack-onap-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
@@ -375,7 +389,7 @@
               abort-all-job: false
 
 - job-template:
-    name: 'xtesting-{phase}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+    name: '{phase}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
 
     disabled: false
 
@@ -477,7 +491,7 @@
 
     builders:
       - description-setter:
-          description: $TEST_TYPE $ONAP_FLAVOR
+          description: $INSTALLER_TYPE $DEPLOY_SCENARIO
       - '{phase}-macro'
 
 # vim: set ts=2 sw=2 expandtab: