Merge "Chore: Move to ubuntu2004-builder"

[ci-management.git] / jjb / global-macros.yaml

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 9c70eec..50a9a57 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -239,35 +239,6 @@
               new-normal: 1
               new-low: 1
 
-- publisher:
-    name: infra-shiplogs
-    # lf-infra macro to finish up a build.
-    #
-    # Handles the following:
-    #   - Shipping logs to Nexus logs site repository
-    #   - Cleanup workspace
-    publishers:
-      - postbuildscript:
-          builders:
-            - role: BOTH
-              build-on:
-                - ABORTED
-                - FAILURE
-                - NOT_BUILT
-                - SUCCESS
-                - UNSTABLE
-              build-steps:
-                - lf-infra-sysstat
-                - lf-infra-ship-logs
-          mark-unstable-if-failed: true
-      - workspace-cleanup:
-          exclude:
-            # Do not clean up *.jenkins-trigger files for jobs that use a
-            # properties file as input for triggering another build.
-            - '**/*.jenkins-trigger'
-          fail-build: false
-
-
 # SCMS
 - scm:
     name: git-scm
@@ -399,8 +370,9 @@
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
                 exclude-no-code-change: 'false'
+                exclude-trivial-rebase: 'true'
+                exclude-wip: 'true'
             - draft-published-event
             - comment-added-contains-event:
                 comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify|verify-helm)\s*$'
@@ -495,6 +467,15 @@
             <goVersion>Golang 1.12</goVersion>
             </org.jenkinsci.plugins.golang.GolangBuildWrapper>
 
+- wrapper:
+    name: golang114
+    wrappers:
+      - raw:
+          xml: |
+            <org.jenkinsci.plugins.golang.GolangBuildWrapper plugin="golang@1.2">
+            <goVersion>Golang 1.14</goVersion>
+            </org.jenkinsci.plugins.golang.GolangBuildWrapper>
+
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by the eCOMP infra.