Merge "Set wget to quiet mode to hide Maven DL output"

[releng/global-jjb.git] / jjb / lf-macros.yaml

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index f90625e..dcd79d3 100644 (file)
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -40,6 +40,12 @@
       - description-setter:
           regexp: '^Build logs: .*'
 
+- builder:
+    name: lf-infra-sysstat
+    builders:
+      - shell: !include-raw:
+          - ../shell/sysstat.sh
+
 - builder:
     name: lf-jacoco-nojava-workaround
     builders:
@@ -50,9 +56,12 @@
 - builder:
     name: lf-maven-install
     builders:
+      # Create a $HOME/.wgetrc to make the Maven download quiet.
+      - shell: 'echo "quiet=on" > "$HOME/.wgetrc"'
       - maven-target:
           maven-version: '{maven-version}'
           goals: '--version'
+      - shell: 'rm "$HOME/.wgetrc"'
 
 # Push a global settings and user settings maven files
 - builder:
@@ -109,6 +118,23 @@
               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:
@@ -143,6 +169,7 @@
     publishers:
       - postbuildscript:
           builders:
+            - lf-infra-sysstat
             - lf-infra-ship-logs
           script-only-if-succeeded: false
           script-only-if-failed: false
@@ -160,7 +187,7 @@
     scm:
       - git:
           credentials-id: '{jenkins-ssh-credential}'
-          url: '$GIT_URL/$GERRIT_PROJECT'
+          url: '{git-url}'
           refspec: '{refspec}'
           branches:
             - 'refs/heads/{branch}'