X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenesis%2Fgenesis.yml;h=df826a09d0f2264882ecc63a3dd7cad73b137cbe;hb=65df29ce15dca349afc9289fb5b726d1b3515e82;hp=dbfba764f2c193a61a72bd42756edf9aba814eba;hpb=243a640c833ee0cd744c5de4ca708ea93983ec3f;p=releng.git

diff --git a/jjb/genesis/genesis.yml b/jjb/genesis/genesis.yml
index dbfba764f..df826a09d 100644
--- a/jjb/genesis/genesis.yml
+++ b/jjb/genesis/genesis.yml
@@ -1,9 +1,15 @@
 - project:
+
     name: genesis
+
+    installer:
+        - foreman
+        - fuel
+        - opensteak
     jobs:
-        - 'genesis-daily-master'
-        - 'genesis-merge'
-        - 'genesis-verify'
+        - 'genesis-{installer}-verify'
+        - 'genesis-{installer}-merge'
+        - 'genesis-{installer}-daily-master'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
@@ -12,72 +18,17 @@
             branch: 'master'
 
     project: 'genesis'
-    somevar: 'foo'
-
-- job-template:
-    name: 'genesis-daily-master'
-
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
 
-    project-type: freestyle
-    varsetabove: '{somevar}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    triggers:
-        - timed: 'H H * * *'
-
-    prebuilders:
-        - test-macro
-
-    builders:
-        - shell: |
-            hostname
-            whoami
-            docker --version
-            cd fuel-build/docker
-            pwd
-            echo foo
-            make clean || true
-            make
-            cd ..
-            echo foo
-            make clean || true
-            sed -i -Ee 's,\ \-t,,g' docker/runcontext
-            make all
-
-    postbuilders:
-        - shell: |
-            rm /var/www/release
-            ln -s /home/jenkins-ci/workspace/genesis-daily/fuel-build/release/ /var/www/
+########################
+# job templates
+########################
 
 - job-template:
-    name: 'genesis-verify'
+    name: 'genesis-{installer}-verify'
 
     project-type: freestyle
-    node: fuel
+
+    node: ericsson-build
 
     logrotate:
         daysToKeep: 30
@@ -86,13 +37,18 @@
         artifactNumToKeep: -1
 
     parameters:
+        - string:
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: 'master'
+
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
+            url: https://gerrit.opnfv.org/gerrit/genesis
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
@@ -110,6 +66,8 @@
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'genesis'
@@ -117,32 +75,25 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/master'
                 file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
-                    - compare-type: ANT
-                      pattern: jjb-templates/**
+                  - compare-type: ANT
+                    pattern: 'common/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/**'
+
 
     builders:
-        - shell: |
-            hostname
-            whoami
-            docker --version
-            cd fuel-build/docker
-            pwd
-            echo foo
-            make clean || true
-            make
-            echo "what tests can we run here?"
-  
+        - '{installer}-verify'
+
 - job-template:
-    name: 'genesis-merge'
+    name: 'genesis-{installer}-merge'
 
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
 
     project-type: freestyle
-    node: fuel
+
+    node: ericsson-build
 
     logrotate:
         daysToKeep: 30
@@ -151,6 +102,9 @@
         artifactNumToKeep: 5
 
     parameters:
+        - string:
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
@@ -159,6 +113,7 @@
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
+            url: https://gerrit.opnfv.org/gerrit/genesis
             refspec: ''
             choosing-strategy: 'default'
 
@@ -179,21 +134,149 @@
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/master'
                 file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
+                  - compare-type: ANT
+                    pattern: 'common/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/**'
+
+    builders:
+        - '{installer}-merge'
+
+- job-template:
+    name: 'genesis-{installer}-daily-master'
+
+    project-type: freestyle
+
+    disabled: true
+
+    node: ericsson-build
+
+    parameters:
+        - string:
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+        - string:
+            name: INSTALLER
+            default: '{installer}'
+            description: "Installer to use."
+        - string:
+            name: GERRIT_BRANCH
+            default: origin/master
+            description: "Branch to build, deploy and test."
+        - string:
+            name: GERRIT_REFSPEC
+            default: refs/heads/master
+            description: "Refspec to retrieve."
 
+    scm:
+        - git:
+            skip-tag: true
+            url: https://gerrit.opnfv.org/gerrit/genesis
+            branches:
+                - $GERRIT_BRANCH
+            refspec: $GERRIT_REFSPEC
+
+    triggers:
+        - pollscm: '@midnight'
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - '{installer}-daily-master'
+
+########################
+# builder macros
+########################
+- builder:
+    name: foreman-verify
     builders:
         - shell: |
-            hostname
-            whoami
-            docker --version
-            cd fuel-build/docker
-            pwd
-            echo foo
-            make clean || true
-            make
-            cd ..
-            echo foo
-            make clean || true
-            sed -i -Ee 's,\ \-t,,g' docker/runcontext
-            make all
+            #!/bin/bash
+
+            echo "Hello World!"
+
+- builder:
+    name: foreman-merge
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "Hello World!"
+
+- builder:
+    name: foreman-daily-master
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "Hello World!"
+
+- builder:
+    name: fuel-verify
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o nounset
+            set -o pipefail
+            set -x
+
+            cd $WORKSPACE/fuel/ci
+            ./build.sh $BUILD_DIRECTORY
+            ls -al $BUILD_DIRECTORY
+
+- builder:
+    name: fuel-merge
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o nounset
+            set -o pipefail
+            set -x
+
+            cd $WORKSPACE/fuel/ci
+            ./build.sh -f t $BUILD_DIRECTORY
+            ls -al $BUILD_DIRECTORY
+
+- builder:
+    name: fuel-daily-master
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o nounset
+            set -o pipefail
+            set -x
+
+            cd $WORKSPACE/fuel/ci
+            ./build.sh -f t $BUILD_DIRECTORY
+            ls -al $BUILD_DIRECTORY
+
+- builder:
+    name: opensteak-verify
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "Hello World!"
+
+- builder:
+    name: opensteak-merge
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "Hello World!"
+
+- builder:
+    name: opensteak-daily-master
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "Hello World!"