Merge "Shorten and remove the word deploy from pod names"

[releng.git] / jjb / joid / joid.yml

diff --git a/jjb/joid/joid.yml b/jjb/joid/joid.yml
index d47709e..e187c88 100644 (file)
--- a/jjb/joid/joid.yml
+++ b/jjb/joid/joid.yml
@@ -17,14 +17,14 @@
             gs-pathname: ''
 
     jobs:
-        - 'joid-{controller}-daily-{stream}-{pod}'
-        - 'joid-daily-deploy-{stream}'
+        - 'joid-{controller}-{pod}-daily-{stream}'
+        - 'joid-deploy-{pod}-daily-{stream}'
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'joid-{controller}-daily-{stream}-{pod}'
+    name: 'joid-{controller}-{pod}-daily-{stream}'
 
     disabled: false
 
@@ -33,7 +33,7 @@
     parameters:
         - project-parameter:
             project: '{installer}'
-        - 'opnfv-build-defaults'
+        - 'intel-us-build-1-defaults'
         - '{installer}-defaults':
             controller: '{controller}'
 
@@ -52,7 +52,7 @@
                 CONTROLLER={controller}
 
 - job-template:
-    name: 'joid-daily-deploy-{stream}'
+    name: 'joid-deploy-{pod}-daily-{stream}'
 
     disabled: false