X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=c2b3f2d8924e710223898a4af1a824f64634fbab;hb=6b8bc7c5fa00404831dbba4935a3af793beeadcd;hp=0c0e69b37f89b2bd9a9c9ec83055f3ff1679ae91;hpb=851b0b6d0cfe84e986548fd596a9b2f18413fefd;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 0c0e69b3..c2b3f2d8 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -1,6 +1,10 @@
 ---
+############
+# BUILDERS #
+############
+
 - builder:
-    name: create-netrc
+    name: lf-infra-create-netrc
     # Macro to create a ~/.netrc file from a Maven settings.xml
     # Parameters:
     #     {server-id} The id of a server as defined in settings.xml
@@ -10,7 +14,7 @@
       - shell: !include-raw-escape: ../shell/create-netrc.sh
 
 - builder:
-    name: gpg-verify-git-signature
+    name: lf-infra-gpg-verify-git-signature
     # Verify gpg signature of the latest commit message in $WORKSPACE
     #
     # This command assumes that $WORKSPACE is a git repo.
@@ -29,7 +33,7 @@
           files:
             - file-id: 'jenkins-log-archives-settings'
               variable: 'SETTINGS_FILE'
-      - create-netrc:
+      - lf-infra-create-netrc:
           server-id: logs
       - shell: !include-raw:
           - ../shell/lftools-install.sh
@@ -39,8 +43,65 @@
       - description-setter:
           regexp: '^Build logs: .*'
 
+- builder:
+    name: lf-infra-sysstat
+    builders:
+      - shell: !include-raw:
+          - ../shell/sysstat.sh
+
+- builder:
+    name: lf-jacoco-nojava-workaround
+    builders:
+      - shell: 'mkdir -p $WORKSPACE/target/classes $WORKSPACE/jacoco/classes'
+
+- builder:
+    name: lf-maven-install
+    # call maven-target builder with a goal of --version to force Jenkins to
+    # install the needed maven version
+    builders:
+      # Create a $HOME/.wgetrc to make the Maven download quiet.
+      - shell: 'echo "quiet=on" > "$HOME/.wgetrc"'
+      - maven-target:
+          maven-version: '{mvn-version}'
+          goals: '--version'
+      - shell: 'rm "$HOME/.wgetrc"'
+
+- builder:
+    name: lf-provide-maven-settings
+    # Push a global settings and user settings maven files
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: '{global-settings-file}'
+              variable: 'GLOBAL_SETTINGS_FILE'
+            - file-id: '{settings-file}'
+              variable: 'SETTINGS_FILE'
+- builder:
+    name: lf-provide-maven-settings-cleanup
+    # Clear maven settings files after we are done using them
+    builders:
+      - shell: |
+          #!/bin/bash
+          set +e  # DO NOT cause build failure if any of the rm calls fail.
+
+          rm "$GLOBAL_SETTINGS_FILE" "$SETTINGS_FILE"
+
+          # In some cases we use the lf-provide-maven-settings macro to produce
+          # a "$HOME/.netrc" file containing credentials. Remove that file here
+          # too if it exists.
+          rm "$HOME/.netrc"
+
+          # DO NOT fail build if any of the above lines fail.
+          exit 0
+
+##############
+# PARAMETERS #
+##############
+
 - parameter:
     name: lf-infra-parameters
+    # Standard parameters used in the LF CI environments. Gerrit variables are
+    # not used by GitHub projects, but defining them isn't harmful.
     parameters:
       - string:
           name: PROJECT
@@ -49,9 +110,6 @@
               Parameter to identify a Gerrit project. This is typically the
               project repo path as exists in Gerrit.
               For example: ofextensions/circuitsw
-
-              (Deprecated) Please use GERRIT_PROJECT instead. A future version
-              of global-jjb will remove this variable.
       - string:
           name: GERRIT_PROJECT
           default: '{project}'
@@ -79,6 +137,52 @@
               Note that Gerrit will override this parameter automatically if a
               job is triggered by Gerrit.
 
+- parameter:
+    name: lf-infra-maven-parameters
+    parameters:
+      - string:
+          name: MAVEN_OPTS
+          default: '{mvn-opts}'
+          description: |
+              Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
+      - string:
+          name: MAVEN_PARAMS
+          default: '{mvn-params}'
+          description: |
+              Maven parameters to pass to the mvn command.
+      - string:
+          name: MVN
+          # Sets an env var for shell scripts to be able to call the dynamically
+          # installed maven without having to calculate the path themselves.
+          default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{mvn-version}/bin/mvn'
+          description: 'Maven selector to be used by shell scripts'
+      - string:
+          name: STAGING_PROFILE_ID
+          default: '{staging-profile-id}'
+          description: |
+              Nexus staging profile ID.
+
+- parameter:
+    name: lf-infra-tox-parameters
+    # Useful parameters when working with TOX
+    # https://tox.readthedocs.io/
+    parameters:
+      - string:
+          name: TOX_DIR
+          default: '{tox-dir}'
+          description: |
+              Path to directory containing tox.ini file.
+      - string:
+          name: TOX_ENVS
+          default: '{tox-envs}'
+          description: |
+              Tox environments to run build against.
+              Example: docs,py2,py3
+
+##############
+# PROPERTIES #
+##############
+
 - property:
     name: lf-infra-properties
     properties:
@@ -89,6 +193,10 @@
           # Do not allow artifacts to be stored in Jenkins.
           artifact-num-to-keep: 0
 
+##############
+# PUBLISHERS #
+##############
+
 - publisher:
     name: lf-infra-publish
     # lf-infra macro to finish up a build.
@@ -99,6 +207,7 @@
     publishers:
       - postbuildscript:
           builders:
+            - lf-infra-sysstat
             - lf-infra-ship-logs
           script-only-if-succeeded: false
           script-only-if-failed: false
@@ -110,12 +219,16 @@
             - '**/*.jenkins-trigger'
           fail-build: false
 
+#######
+# SCM #
+#######
+
 - scm:
     name: lf-infra-gerrit-scm
     scm:
       - git:
           credentials-id: '{jenkins-ssh-credential}'
-          url: '$GIT_URL/$GERRIT_PROJECT'
+          url: '{git-url}'
           refspec: '{refspec}'
           branches:
             - 'refs/heads/{branch}'
@@ -125,6 +238,23 @@
             recursive: '{submodule-recursive}'
           choosing-strategy: '{choosing-strategy}'
 
+- scm:
+    name: lf-infra-github-scm
+    scm:
+      - git:
+          credentials-id: '{jenkins-ssh-credential}'
+          url: '{url}'
+          refspec: '{refspec}'
+          skip-tag: true
+          wipe-workspace: true
+          submodule:
+            recursive: '{submodule-recursive}'
+          choosing-strategy: '{choosing-strategy}'
+
+############
+# WRAPPERS #
+############
+
 - wrapper:
     name: lf-infra-wrappers
     wrappers: