engine: Align job names

Change-Id: I98bbf5a3711e45c5af32bfdae18e9b3334c7f6b6

diff --git a/jjb/engine/onap-periodic-jobs/onap-builder-macros.yaml b/jjb/engine/onap-periodic-jobs/onap-builder-macros.yaml
index 9162c8d1b6235bf5376f3ab8146741e4781d0523..7fe9912bbd1adf2dcb436a7fb752de50bb1b6982 100644 (file)
--- a/jjb/engine/onap-periodic-jobs/onap-builder-macros.yaml
+++ b/jjb/engine/onap-periodic-jobs/onap-builder-macros.yaml
@@ -27,13 +27,13 @@
           !include-raw: ./scripts/deploy.sh
 
 - builder:
-    name: 'onap-oom-hc-builder-macro'
+    name: 'onap-oom-healthcheck-builder-macro'
     builders:
       - shell:
           !include-raw: ./scripts/oom-healthcheck.sh
 
 - builder:
-    name: 'onap-hc-builder-macro'
+    name: 'onap-healthcheck-builder-macro'
     builders:
       - shell:
           !include-raw: ./scripts/onap-healthcheck.sh

diff --git a/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml b/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml
index e6514e6cd7c673167c0b775a8ac23dfcbd7bbf18..059b20d5672c006cef7014cd5406e92eedeed08c 100644 (file)
--- a/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml
+++ b/jjb/engine/onap-periodic-jobs/onap-online-deploy-test-jobs.yaml
@@ -76,21 +76,21 @@
     job-phase:
       - deploy:
           build-timeout: 420
-      - oom-hc:
+      - oom-healthcheck:
           build-timeout: 30
           test-type: oom-healthcheck
-      - hc:
+      - healthcheck:
           build-timeout: 30
           test-type: onap-healthcheck
       - promote:
           build-timeout: 240
 
     jobs:
-      - '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
-      - 'onap-{onap-profile}-{job-phase}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+      - '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
+      - 'onap-{onap-profile}-{environment-type}-{job-phase}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
 
 - job-template:
-    name: '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+    name: '{deploy-scenario}-{onap-profile}-{environment-type}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
 
     project-type: multijob
 
@@ -238,7 +238,7 @@
           name: Deploy ONAP using OOM (not activated)
           condition: ALWAYS
           projects:
-            - name: 'onap-{environment-type}-deploy-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+            - name: 'onap-{onap-profile}-{environment-type}-deploy-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -267,7 +267,7 @@
           name: K8S and OOM Healthcheck using xtesting (not activated)
           condition: ALWAYS
           projects:
-            - name: 'onap-{onap-profile}-oom-hc-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+            - name: 'onap-{onap-profile}-{environment-type}-oom-healthcheck-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -297,7 +297,7 @@
           execution-type: SEQUENTIALLY
           condition: ALWAYS
           projects:
-            - name: 'onap-{onap-profile}-hc-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+            - name: 'onap-{onap-profile}-{environment-type}-healthcheck-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -323,7 +323,7 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-            - name: 'onap-{environment-type}-{onap-profile}-healthdist-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+            - name: 'onap-{onap-profile}-{environment-type}-healthdist-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -353,7 +353,7 @@
           name: Promote ONAP (not activated)
           condition: ALWAYS
           projects:
-            - name: 'onap-{onap-profile}-promote-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+            - name: 'onap-{onap-profile}-{environment-type}-promote-{distro}-{cloud}-{type}-{ci-loop}-{cloud}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -376,7 +376,7 @@
               abort-all-job: false
 
 - job-template:
-    name: 'onap-{onap-profile}-{job-phase}-{environment-type}-{distro}-{type}-{ci-loop}-{cloud}-{onap-branch}'
+    name: 'onap-{onap-profile}-{environment-type}-{job-phase}-{distro}-{cloud}-{type}-{ci-loop}-{onap-branch}'
 
     disabled: false