Fix phase jobs for cloud infra jobs

Change-Id: Ifdac9ccac82592f14bbe9a6889aa94df6cfc96bc

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 133d44c61981efd2fcfc55563fa922328eda6c17..ead70772b8af2e8a881f0f74e3066fb03f74762a 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -86,7 +86,7 @@
 
     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}'
@@ -228,10 +228,10 @@
               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
@@ -254,10 +254,10 @@
               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
@@ -280,7 +280,7 @@
               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
@@ -303,7 +303,7 @@
               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
@@ -375,7 +375,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
 

diff --git a/jjb/cloud-infra/onap-healthcheck.sh b/jjb/cloud-infra/onap-healthcheck.sh
index 789e1a5ce994b9e98560f639aaf11a877730580a..15914f83c3360546aee2787be051230722c78768 100644 (file)
--- a/jjb/cloud-infra/onap-healthcheck.sh
+++ b/jjb/cloud-infra/onap-healthcheck.sh
@@ -22,7 +22,7 @@ set -o errexit
 set -o nounset
 
 cd $WORKSPACE
-echo "Info: Starting OOM Healthcheck using XTesting"
+echo "Info: Starting ${TEST_TYPE}-${ONAP_FLAVOR} using Xtesting"
 echo "-------------------------------------------------------------------------"
 echo "Info: Cloning opnfv/xtesting-onap repository"
 cd $HOME && /bin/rm -rf $WORKSPACE

diff --git a/jjb/cloud-infra/oom-healthcheck.sh b/jjb/cloud-infra/oom-healthcheck.sh
index 789e1a5ce994b9e98560f639aaf11a877730580a..15914f83c3360546aee2787be051230722c78768 100644 (file)
--- a/jjb/cloud-infra/oom-healthcheck.sh
+++ b/jjb/cloud-infra/oom-healthcheck.sh
@@ -22,7 +22,7 @@ set -o errexit
 set -o nounset
 
 cd $WORKSPACE
-echo "Info: Starting OOM Healthcheck using XTesting"
+echo "Info: Starting ${TEST_TYPE}-${ONAP_FLAVOR} using Xtesting"
 echo "-------------------------------------------------------------------------"
 echo "Info: Cloning opnfv/xtesting-onap repository"
 cd $HOME && /bin/rm -rf $WORKSPACE