X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=310df5d7bf5707a1fce725564fcf1d14118bf6d0;hb=56864adf9a6062190e4b9bedc2944cb6a95f8014;hp=175af865d94006fde9377fc489525c1ed1622247;hpb=0912741cdcac047d4ef2e0d689a0260debc92b32;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 175af865..310df5d7 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -1,6 +1,7 @@
 ---
+# 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 +11,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 +30,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,6 +40,35 @@
       - description-setter:
           regexp: '^Build logs: .*'
 
+- builder:
+    name: lf-jacoco-nojava-workaround
+    builders:
+      - shell: 'mkdir -p $WORKSPACE/target/classes $WORKSPACE/jacoco/classes'
+
+# call maven-target builder with a goal of --version to force Jenkins to
+# install the needed maven version
+- builder:
+    name: lf-maven-install
+    builders:
+      - maven-target:
+          maven-version: '{maven-version}'
+          goals: '--version'
+
+# Push a global settings and user settings maven files
+- builder:
+    name: lf-provide-maven-settings
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: '{global-settings-file}'
+              variable: 'GLOBAL_SETTINGS_FILE'
+            - file-id: '{settings-file}'
+              variable: 'SETTINGS_FILE'
+
+
+# PARAMETERS
+# Standard parameters used in the LF CI environments. Gerrit variables are not
+# used by GitHub projects, but defining them isn't harmful
 - parameter:
     name: lf-infra-parameters
     parameters:
@@ -79,6 +109,36 @@
               Note that Gerrit will override this parameter automatically if a
               job is triggered by Gerrit.
 
+# Useful parameters when working with TOX
+# https://tox.readthedocs.io/
+- parameter:
+    name: lf-infra-tox-parameters
+    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
+
+# Set an env var for shell scripts to be able to call the dynamically installed
+# maven without having to calculate the path themselves
+- parameter:
+    name: lf-maven-exec
+    parameters:
+      - string:
+          name: MVN
+          # yamllint disable-line rule:line-length
+          default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{maven-version}/bin/mvn'
+          description: 'Maven selector to be used by shell scripts'
+
+
+# PROPERTIES
 - property:
     name: lf-infra-properties
     properties:
@@ -89,6 +149,7 @@
           # 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.
@@ -110,12 +171,13 @@
             - '**/*.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}'
@@ -130,7 +192,7 @@
     scm:
       - git:
           credentials-id: '{jenkins-ssh-credential}'
-          url: '$GIT_URL/$PROJECT'
+          url: '{url}'
           refspec: '{refspec}'
           skip-tag: true
           wipe-workspace: true
@@ -138,6 +200,7 @@
             recursive: '{submodule-recursive}'
           choosing-strategy: '{choosing-strategy}'
 
+# WRAPPERS
 - wrapper:
     name: lf-infra-wrappers
     wrappers: