X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenesis%2Fgenesis-fuel.yml;h=cc134fb101c72068ba6a0386fe4468222c066af0;hb=c2e2b44e6f1a72658b0dcdb6cf03b737096565a0;hp=4dbce165b68626167cef75bc19e6615daeb66e74;hpb=4746334a611cc80afd7c4829e0e70c3e99cc4e79;p=releng.git

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 4dbce165b..cc134fb10 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -9,15 +9,15 @@
 
     installer: 'fuel'
 
-    jobs:
-        - 'genesis-fuel-verify-build-{stream}'
-        - 'genesis-fuel-merge-{stream}'
-        - 'genesis-fuel-daily-{stream}'
-        - 'genesis-fuel-build-{stream}'
-        - 'genesis-fuel-deploy-{stream}'
-        - 'genesis-fuel-deploy-runner-{stream}'
-        - 'genesis-fuel-lab-reconfig-{stream}'
-        - 'genesis-fuel-verify-deploy-virtual-{stream}'
+#    jobs:
+#        - 'genesis-fuel-verify-build-{stream}'
+#        - 'genesis-fuel-merge-{stream}'
+#        - 'genesis-fuel-daily-{stream}'
+#        - 'genesis-fuel-build-{stream}'
+#        - 'genesis-fuel-deploy-{stream}'
+#        - 'genesis-fuel-deploy-runner-{stream}'
+#        - 'genesis-fuel-lab-reconfig-{stream}'
+#        - 'genesis-fuel-verify-deploy-virtual-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
@@ -25,11 +25,11 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-            job-disabled: false
+            disabled: true
         - stable-arno:
             branch: 'stable/arno'
             gs-pathname: '/arno'
-            job-disabled: true
+            disabled: true
 
 ########################
 # job templates
@@ -38,10 +38,10 @@
 - job-template:
     name: 'genesis-fuel-verify-build-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
+    disabled: true
+
     concurrent: true
 
     properties:
@@ -49,18 +49,12 @@
             enabled: true
             max-total: 3
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
 
@@ -70,10 +64,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -124,10 +114,10 @@
 - job-template:
     name: 'genesis-fuel-merge-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
+    disabled: true
+
     concurrent: true
 
     properties:
@@ -135,18 +125,12 @@
             enabled: true
             max-total: 2
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: ''
 
@@ -156,10 +140,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -204,19 +184,17 @@
 - job-template:
     name: 'genesis-fuel-daily-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
-    disabled: '{job-disabled}'
+    disabled: true
 
     triggers:
-        - 'fuel-{stream}'
+        - 'genesis-fuel-{stream}-trigger'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
 
@@ -226,12 +204,6 @@
             refspec: ''
             branch: '{branch}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - trigger-builds:
           - project: 'genesis-fuel-build-{stream}'
@@ -260,25 +232,20 @@
                 # 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
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    disabled: true
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -310,20 +277,14 @@
 - job-template:
     name: 'genesis-fuel-build-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    disabled: true
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
 
@@ -345,16 +306,14 @@
 - job-template:
     name: 'genesis-fuel-deploy-{stream}'
 
-    project-type: freestyle
-
-    disabled: false
+    disabled: true
 
     node: opnfv-jump-2
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -368,15 +327,8 @@
             refspec: ''
             branch: '{branch}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'fuel-download-artifact'
-        - 'fuel-odl-plugin-build'
         - 'fuel-deploy'
 
     publishers:
@@ -386,22 +338,12 @@
 - job-template:
     name: 'genesis-fuel-lab-reconfig-{stream}'
 
-    project-type: freestyle
-
-    disabled: false
-
-    node: master
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    disabled: true
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -427,8 +369,6 @@
 - job-template:
     name: 'genesis-fuel-verify-deploy-virtual-{stream}'
 
-    project-type: freestyle
-
     disabled: true
 
     node: ericsson-build
@@ -436,7 +376,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: ''
 
@@ -446,12 +386,6 @@
             refspec: ''
             branch: 'master'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'fuel-deploy-virtual'
 
@@ -459,7 +393,7 @@
 # parameter macros
 ########################
 - parameter:
-    name: fuel-parameter
+    name: genesis-fuel-parameter
     parameters:
         - string:
             name: INSTALLER
@@ -526,51 +460,6 @@
             echo "--------------------------------------------------------"
             echo "Done!"
 
-- builder:
-    name: 'fuel-odl-plugin-build'
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o nounset
-            set -o pipefail
-
-            # install dependencies if they are not available already
-            if [[ ! $(rpm -qa | grep rubygems) ]]; then
-                echo "Rubygems not found, but required for Fuel Plugin build ... attempting to install"
-                sudo yum install -y rubygems ruby-devel
-            fi
-
-            if [[ ! $(gem list | grep fpm) ]]; then
-                echo "fpm gem not found, but required for Fuel Plugin build ... attempting to install"
-                sudo gem install fpm
-            fi
-
-            if [[ ! $(pip list | grep fuel-plugin-builder) ]]; then
-                echo "fuel-plugin-builder not found, but required for Fuel Plugin build ... attempting to install"
-                sudo pip install fuel-plugin-builder
-            fi
-
-            # log info to console
-            echo "Starting the build of Fuel Opendaylight Plugin. This could take some time..."
-            echo "--------------------------------------------------------"
-            echo
-
-            export ODL_PLUGIN_BRANCH="juno/lithium-sr1"
-
-            cd $WORKSPACE
-            git clone https://github.com/stackforge/fuel-plugin-opendaylight
-
-            pushd $WORKSPACE/fuel-plugin-opendaylight
-            git checkout $ODL_PLUGIN_BRANCH
-            popd
-
-            fpb --build fuel-plugin-opendaylight/
-
-            echo
-            echo "--------------------------------------------------------"
-            echo "Done!"
-
 - builder:
     name: 'fuel-deploy'
     builders:
@@ -597,7 +486,6 @@
             # set CONFDIR, BRIDGE
             export CONFDIR=$WORKSPACE/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2
             export BRIDGE=pxebr
-            export PLUGIN=$WORKSPACE/fuel-plugin-opendaylight
 
             # cleanup first
             sudo $WORKSPACE/common/ci/clean.sh -base_config $WORKSPACE/foreman/ci/inventory/lf_pod2_ksgen_settings.yml
@@ -612,8 +500,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 -p $PLUGIN -nh"
-            sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -p $PLUGIN -nh
+            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 "--------------------------------------------------------"
@@ -793,11 +681,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 * * *'