Fix genesis-merge jobs not launching

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

diff --git a/jjb/genesis/genesis.yml b/jjb/genesis/genesis.yml
index 5803303..72c978d 100644 (file)
--- a/jjb/genesis/genesis.yml
+++ b/jjb/genesis/genesis.yml
@@ -1,7 +1,6 @@
 - project:
     name: genesis
     jobs:
-        - 'genesis-test'
         - 'genesis-daily-master'
         - 'genesis-merge'
         - 'genesis-verify'
@@ -13,22 +12,6 @@
             branch: 'master'
 
     project: 'genesis'
-    somevar: 'foo'
-
-- job-template:
-    name: genesis-test
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - shell: |
-            echo "Hello world from genesis"
 
 - job-template:
     name: 'genesis-daily-master'
@@ -40,7 +23,7 @@
     #     branch:    branch (eg. stable)
 
     project-type: freestyle
-    varsetabove: '{somevar}'
+    node: fuel
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -48,6 +31,16 @@
         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}'
@@ -55,16 +48,22 @@
     triggers:
         - timed: 'H H * * *'
 
-    prebuilders:
-        - test-macro
-
     builders:
         - shell: |
-            echo "Hello world from genesis {somevar} daily"
-        - test-macro
-
-    postbuilders:
-        - test-macro
+            hostname
+            whoami
+            docker --version
+            cd fuel-build/docker
+            pwd
+            echo foo
+            make clean || true
+            make
+            cd ..
+            echo foo
+            make clean || true
+            make all
+            sudo rm /var/www/genesis-fuel/daily
+            ln -s /home/jenkins-ci/workspace/genesis-daily-master/fuel-build/release/ /var/www/genesis-fuel/daily
 
 - job-template:
     name: 'genesis-verify'
@@ -103,26 +102,27 @@
                 - 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'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/master'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
-                    - compare-type: ANT
-                      pattern: jjb-templates/**
 
     builders:
         - shell: |
-            echo foo
-            echo bar
             hostname
-            ls -la
-
-
+            whoami
+            docker --version
+            cd fuel-build/docker
+            pwd
+            echo foo
+            make clean || true
+            make
+            echo "what tests can we run here?"
+  
 - job-template:
     name: 'genesis-merge'
 
@@ -167,13 +167,18 @@
                 branches:
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/master'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
 
     builders:
         - shell: |
-            echo foo
-            echo bar
             hostname
-            ls -la
+            whoami
+            docker --version
+            cd fuel-build/docker
+            pwd
+            echo foo
+            make clean || true
+            make
+            cd ..
+            echo foo
+            make clean || true
+            make all