Fix global macros

Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 97a407d..86900ea 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -7,8 +7,7 @@
     build-days-to-keep: 30
     build-num-to-keep: 40
     build-artifact-days-to-keep: -1
-    build-artifact-num-to-keep: 5
+    build-artifact-num-to-keep: 10
     # Timeout in minutes
     build-timeout: 360
-    #build-node: ubuntu-16.04-basebuild-2c-1g
     ssh-credentials: 'agl-jobbuilder'

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index ed27fec..7728879 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -99,10 +99,10 @@
             - comment-added-contains-event:
                 comment-contains-value: 'REVERIFY'
           projects:
-            - project-compare-type: 'PLAIN'
+            - project-compare-type: 'ANT'
               project-pattern: '{name}'
               branches:
-                - branch-compare-type: 'PLAIN'
+                - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
 
 - trigger:
@@ -129,10 +129,10 @@
             - comment-added-contains-event:
                 comment-contains-value: 'REVERIFY'
           projects:
-            - project-compare-type: 'PLAIN'
+            - project-compare-type: 'ANT'
               project-pattern: '{name}'
               branches:
-                - branch-compare-type: 'PLAIN'
+                - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
           silent: 'true'
 
@@ -146,10 +146,10 @@
             - comment-added-contains-event:
                 comment-contains-value: 'remerge'
           projects:
-            - project-compare-type: 'PLAIN'
+            - project-compare-type: 'ANT'
               project-pattern: '{name}'
               branches:
-                - branch-compare-type: 'PLAIN'
+                - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
 
 - trigger:
@@ -168,10 +168,10 @@
             - comment-added-contains-event:
                 comment-contains-value: 'reverify'
           projects:
-            - project-compare-type: 'PLAIN'
+            - project-compare-type: 'ANT'
               project-pattern: '{name}'
               branches:
-                - branch-compare-type: 'PLAIN'
+                - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
           silent-start: 'true'
 
@@ -184,10 +184,10 @@
             - comment-added-contains-event:
                 comment-contains-value: 'fullcheck'
           projects:
-            - project-compare-type: 'PLAIN'
+            - project-compare-type: 'ANT'
               project-pattern: '{name}'
               branches:
-                - branch-compare-type: 'PLAIN'
+                - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
           silent-start: 'true'
 
@@ -201,10 +201,10 @@
             - comment-added-contains-event:
                 comment-contains-value: 'remerge'
           projects:
-            - project-compare-type: 'PLAIN'
+            - project-compare-type: 'ANT'
               project-pattern: '{name}'
               branches:
-                - branch-compare-type: 'PLAIN'
+                - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
           silent-start: 'true'
 
@@ -216,10 +216,10 @@
           trigger-on:
             - ref-updated-event
           projects:
-            - project-compare-type: 'PLAIN'
+            - project-compare-type: 'ANT'
               project-pattern: '{name}'
               branches:
-                - branch-compare-type: 'PLAIN'
+                - branch-compare-type: 'ANT'
                   branch-pattern: 'refs/tags/**'
 
 # Publishers