X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenesis%2Fgenesis-fuel.yml;h=fca14298d17d6c6b03fde90184e3e636b1790023;hb=2141a17cadce1d6d451f501d4038fcacb7b52f8f;hp=d2ef491993e99e234bb0fea06bb0aa8411ae4904;hpb=e3478ee13a7bc2a3d156e214d0e26e37f9aca7d2;p=releng.git

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index d2ef49199..fca14298d 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -38,8 +38,6 @@
 - job-template:
     name: 'genesis-fuel-verify-build-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
     concurrent: true
@@ -60,7 +58,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
 
@@ -70,10 +68,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -124,8 +118,6 @@
 - job-template:
     name: 'genesis-fuel-merge-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
     concurrent: true
@@ -146,7 +138,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: ''
 
@@ -156,10 +148,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -204,19 +192,17 @@
 - job-template:
     name: 'genesis-fuel-daily-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
     disabled: '{obj:disabled}'
 
     triggers:
-        - 'fuel-{stream}'
+        - 'genesis-fuel-{stream}-trigger'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
 
@@ -268,12 +254,8 @@
 - job-template:
     name: 'genesis-fuel-deploy-runner-{stream}'
 
-    project-type: freestyle
-
     disabled: false
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -283,7 +265,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -315,8 +297,6 @@
 - job-template:
     name: 'genesis-fuel-build-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
     logrotate:
@@ -328,7 +308,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
 
@@ -350,8 +330,6 @@
 - job-template:
     name: 'genesis-fuel-deploy-{stream}'
 
-    project-type: freestyle
-
     disabled: false
 
     node: opnfv-jump-2
@@ -359,7 +337,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -390,12 +368,8 @@
 - job-template:
     name: 'genesis-fuel-lab-reconfig-{stream}'
 
-    project-type: freestyle
-
     disabled: false
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -405,7 +379,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -431,8 +405,6 @@
 - job-template:
     name: 'genesis-fuel-verify-deploy-virtual-{stream}'
 
-    project-type: freestyle
-
     disabled: true
 
     node: ericsson-build
@@ -440,7 +412,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: ''
 
@@ -463,7 +435,7 @@
 # parameter macros
 ########################
 - parameter:
-    name: fuel-parameter
+    name: genesis-fuel-parameter
     parameters:
         - string:
             name: INSTALLER
@@ -751,11 +723,11 @@
 # trigger macros
 ########################
 - trigger:
-    name: 'fuel-master'
+    name: 'genesis-fuel-master-trigger'
     triggers:
         - timed: '0 5 * * *'
 
 - trigger:
-    name: 'fuel-stable-arno'
+    name: 'genesis-fuel-stable-arno-trigger'
     triggers:
         - timed: '0 7 * * *'