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

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 405fbc0ad..fca14298d 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -25,9 +25,11 @@
         - master:
             branch: 'master'
             gs-pathname: ''
+            disabled: true
         - stable-arno:
             branch: 'stable/arno'
             gs-pathname: '/arno'
+            disabled: true
 
 ########################
 # job templates
@@ -36,8 +38,6 @@
 - job-template:
     name: 'genesis-fuel-verify-build-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
     concurrent: true
@@ -58,7 +58,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
 
@@ -68,10 +68,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -122,8 +118,6 @@
 - job-template:
     name: 'genesis-fuel-merge-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
     concurrent: true
@@ -144,7 +138,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: ''
 
@@ -154,10 +148,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -202,19 +192,17 @@
 - job-template:
     name: 'genesis-fuel-daily-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
-    disabled: false
+    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}'
 
@@ -250,23 +238,24 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'yardstick-fuel-{stream}'
-            block: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
+        # - trigger-builds:
+          # - project: 'yardstick-fuel-{stream}'
+            # block: true
+            # block-thresholds:
+                # build-step-failure-threshold: 'never'
+                # failure-threshold: 'never'
+                # unstable-threshold: 'FAILURE'
+
+    publishers:
+        - trigger-parameterized-builds:
+            - project: 'genesis-foreman-daily-{stream}'
+              trigger-with-no-params: true
 
 - job-template:
     name: 'genesis-fuel-deploy-runner-{stream}'
 
-    project-type: freestyle
-
     disabled: false
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -276,7 +265,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - foreman-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -308,8 +297,6 @@
 - job-template:
     name: 'genesis-fuel-build-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
     logrotate:
@@ -321,7 +308,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
 
@@ -343,8 +330,6 @@
 - job-template:
     name: 'genesis-fuel-deploy-{stream}'
 
-    project-type: freestyle
-
     disabled: false
 
     node: opnfv-jump-2
@@ -352,7 +337,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -383,12 +368,8 @@
 - job-template:
     name: 'genesis-fuel-lab-reconfig-{stream}'
 
-    project-type: freestyle
-
     disabled: false
 
-    node: master
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -398,7 +379,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -424,8 +405,6 @@
 - job-template:
     name: 'genesis-fuel-verify-deploy-virtual-{stream}'
 
-    project-type: freestyle
-
     disabled: true
 
     node: ericsson-build
@@ -433,7 +412,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: ''
 
@@ -456,7 +435,7 @@
 # parameter macros
 ########################
 - parameter:
-    name: fuel-parameter
+    name: genesis-fuel-parameter
     parameters:
         - string:
             name: INSTALLER
@@ -547,7 +526,7 @@
             chmod a+x $TMPDIR
 
             # set CONFDIR, BRIDGE
-            export CONFDIR=$WORKSPACE/fuel/deploy/templates/hardware_environment/old_conf/linux_foundation_lab/pod2/ha
+            export CONFDIR=$WORKSPACE/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2
             export BRIDGE=pxebr
 
             # cleanup first
@@ -563,8 +542,8 @@
 
             # start the deployment
             echo "Issuing command"
-            echo "sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE"
-            sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE
+            echo "sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh"
+            sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh
 
             echo
             echo "--------------------------------------------------------"
@@ -744,11 +723,11 @@
 # trigger macros
 ########################
 - trigger:
-    name: 'fuel-master'
+    name: 'genesis-fuel-master-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 5 * * *'
 
 - trigger:
-    name: 'fuel-stable-arno'
+    name: 'genesis-fuel-stable-arno-trigger'
     triggers:
         - timed: '0 7 * * *'