X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-macros.yaml;h=1f751da62b8c73754ecdef809a0d4bbdc9889972;hb=250a5263c0dcfdb01016b1eae008fe73c93f7f19;hp=85c2756442a9297ff3a721ea0a090bc5b90128a7;hpb=dc39c1e60ee53b4d74a99a61f0cea216c0359d4d;p=ci-management.git

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 85c275644..1f751da62 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -4,12 +4,6 @@
 # vim: sw=2 ts=2 sts=2 et :
 
 # BUILDERS
-- builder:
-    name: ci-management-check-unicode
-    builders:
-      - shell: |
-          $WORKSPACE/scripts/check-unicode.sh jjb/
-
 - builder:
     name: provide-maven-settings
     builders:
@@ -47,6 +41,21 @@
 
 - builder:
     name: maven-docker-push-daily
+    builders:
+      - maven-target:
+          maven-version: '{maven-version}'
+          pom: '{pom}'
+          goals: 'clean deploy -B -P {mvn-profile} {mvn-params}'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+          properties:
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
+
+- builder:
+    name: maven-docker-push-daily-test
     builders:
       - maven-target:
           maven-version: '{maven-version}'
@@ -57,7 +66,6 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
           properties:
-            - maven.test.skip=true
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
 
@@ -107,6 +115,14 @@
           default: '$JOB_NAME-$BUILD_NUMBER'
           description: 'Used by Heat to generate a unique stack & vm name'
 
+- parameter:
+    name: maven-params
+    parameters:
+      - string:
+          name: MAVEN_PARAMS
+          default: '{mvn-params}'
+          description: Maven parameters to pass to the mvn command.
+
 - parameter:
     name: maven-exec
     parameters:
@@ -226,34 +242,32 @@
 
 - publisher:
     name: infra-shiplogs
-    # To archive things, the job will need to create an "archives" directory in
-    # the workspace and this macro will handle copying the contents of the
-    # archives directory.
-    #
-    # Uses the build parameter ARCHIVE_ARTIFACTS if not empty to find files to
-    # archive. You can pass globstar patterns for example "**/*.xml **/*.log" as
-    # the archive pattern. This is a space separated list of files to archive.
+    # lf-infra macro to finish up a build.
     #
-    # Also ensure that the workspace is cleaned up at the end of the build.
+    # Handles the following:
+    #   - Shipping logs to Nexus logs site repository
+    #   - Cleanup workspace
     publishers:
       - postbuildscript:
           builders:
-            - shell: !include-raw-escape: include-raw-deploy-archives.sh
-            - maven-target:
-                maven-version: '{maven-version}'
-                pom: '.archives/deploy-archives.xml'
-                goals: 'clean deploy -V -B -q -Dmaven.repo.local=/tmp/r'
-                settings: 'jenkins-log-archives-settings'
-                settings-type: cfp
-                global-settings: 'global-settings'
-                global-settings-type: cfp
-            - description-setter:
-                regexp: '^Build logs: .*'
-          script-only-if-succeeded: false
-          script-only-if-failed: false
+            - 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:
-          fail-build: false`
+          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:
@@ -413,6 +427,15 @@
           timeout: 360
           fail: true
 
+- wrapper:
+    name: golang
+    wrappers:
+      - raw:
+          xml: |
+            <org.jenkinsci.plugins.golang.GolangBuildWrapper plugin="golang@1.2">
+            <goVersion>Golang 1.10</goVersion>
+            </org.jenkinsci.plugins.golang.GolangBuildWrapper>
+
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by the eCOMP infra.
@@ -429,3 +452,20 @@
             - 'onap-jenkins-ssh'
       - openstack:
           single-use: true
+
+- wrapper:
+    # This wrapper is used for docker build jobs to use the dedicated docker
+    # build VM and turn off OpenStack single-use
+    name: infra-wrappers-docker-build
+    wrappers:
+      - timestamps
+      - timeout:
+          type: absolute
+          timeout: '{build-timeout}'
+          timeout-var: 'BUILD_TIMEOUT'
+          fail: true
+      - ssh-agent-credentials:
+          users:
+            - 'onap-jenkins-ssh'
+      - openstack:
+          single-use: false