Update job-template names

Update job-template names from {project} to {project-name} variable.
The changes are being made because  the "project" variable allows
slashes, and the job names can't have slashes in them.

Issue: CIMAN-1
Change-Id: Ieeccbde889053cfd5d50de9673a52bb327652f97
Signed-off-by: Milin <mjaiswal@contractor.linuxfoundation.org>

diff --git a/jjb/akraino-templates/akraino-jjb-docker.yaml b/jjb/akraino-templates/akraino-jjb-docker.yaml
index 6c6afa5..62e2dc5 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-docker.yaml
+++ b/jjb/akraino-templates/akraino-jjb-docker.yaml
@@ -16,7 +16,7 @@
 #
 - job-template:
     id: 'akraino-project-stream-docker'
-    name: '{project}-{stream}-docker'
+    name: '{project-name}-{stream}-docker'
     project-type: freestyle
     node: '{build-node}'
 
@@ -54,7 +54,7 @@
 
 - job-template:
     id: 'akraino-project-stream-stage-docker'
-    name: '{project}-{stream}-stage-docker'
+    name: '{project-name}-{stream}-stage-docker'
     project-type: freestyle
     node: '{build-node}'
 

diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml
index 58320ce..7090b31 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-templates.yaml
+++ b/jjb/akraino-templates/akraino-jjb-templates.yaml
@@ -16,7 +16,7 @@
 #
 - job-template:
     id: akraino-project-stream-release-config
-    name: '{project}-{stream}-release-config'
+    name: '{project-name}-{stream}-release-config'
 
     ######################
     # Default parameters #
@@ -138,7 +138,7 @@
 
 - job-template:
     id: akraino-project-stream-stage-config
-    name: '{project}-{stream}-stage-config'
+    name: '{project-name}-{stream}-stage-config'
 
     ######################
     # Default parameters #
@@ -264,7 +264,7 @@
 
 - job-template:
     id: akraino-project-stream-verify
-    name: '{project}-{stream}-verify'
+    name: '{project-name}-{stream}-verify'
     archive-artifacts: >
       **/*.log
     build-days-to-keep: 30