X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=6e213e4a204293e0bd94c78b29fc4905daa05c4f;hb=fc75b20f7ec19cb7cfdbd74385bf1262ccb7a84c;hp=996ae5a4eb45999fe5aa758e2b2153176fd0493d;hpb=1c6c45e731e8941f3ff7894641ca7aee77a80426;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 996ae5a4..6e213e4a 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -3,11 +3,15 @@
 # BUILDERS #
 ############
 
+- builder:
+    name: lf-fetch-dependent-patches
+    builders:
+      - shell: !include-raw: ../shell/gerrit-fetch-dependencies.sh
+      - inject:
+          properties-file: $WORKSPACE/.dependency.properties
+
 - builder:
     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
     builders:
       - inject:
           properties-content: 'SERVER_ID={server-id}'
@@ -15,25 +19,6 @@
 
 - builder:
     name: lf-infra-docker-login
-    # Login into a custom hosted docker registry and / or docker.io
-    #
-    # The Jenkins system should have the following global variables defined
-    #
-    # DOCKER_REGISTRY : Optional
-    #                   The DNS address of the registry (IP or FQDN)
-    #                   ex: nexus3.example.com
-    #
-    # REGISTRY_PORTS  : Required if DOCKER_REGISTRY is set
-    #                   Space separated listing of the registry ports to login
-    #                   to
-    #                   ex: 10001 10002 10003 10004
-    #
-    # DOCKERHUB_EMAIL : Optional
-    #                   If this variable is set then an attempt to login to
-    #                   DockerHub (docker.io) will be also made. It should be
-    #                   set to the email address for the credentials that will
-    #                   get looked up. Only _one_ credential will ever be found
-    #                   in the maven settings file for DockerHub
     builders:
       - lf-provide-maven-settings:
           global-settings-file: '{global-settings-file}'
@@ -43,10 +28,6 @@
 
 - builder:
     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.
-    #
     # TODO: Verify signature after downloading users public key from a locally
     # created repository instead of the public keymesh. This requires a process
     # in place to get ODL developers public keys into a local repository without
@@ -118,12 +99,6 @@
 
 - builder:
     name: lf-infra-deploy-maven-file
-    # Deploy files to a repository.
-    #
-    # The builder requires passing the following parameters
-    # REPO_ID:           Repository ID
-    # GROUP_ID:          Group ID of the repository
-    # UPLOAD_FILES_PATH: Path to directory containing one or more files
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -144,8 +119,6 @@
 
 - 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"'
@@ -156,7 +129,6 @@
 
 - builder:
     name: lf-provide-maven-settings
-    # Push a global settings and user settings maven files
     builders:
       - config-file-provider:
           files:
@@ -167,8 +139,6 @@
 
 - builder:
     name: lf-pip-install
-    # Call pip install to install packages into a virtualenv
-    # The first package listed in PIP_PACKAGES is used as the virtualenv name.
     builders:
       - inject:
           properties-content: PIP_PACKAGES={pip-packages}
@@ -176,7 +146,6 @@
 
 - builder:
     name: lf-provide-maven-settings-cleanup
-    # Clear maven settings files after we are done using them
     builders:
       - shell: |
           #!/bin/bash
@@ -215,6 +184,12 @@
 - parameter:
     name: lf-infra-maven-parameters
     parameters:
+      - string:
+          name: M2_HOME
+          # Sets an env var for shell scripts to be able to call the dynamically
+          # installed maven without having to calculate the M2_HOME themselves.
+          default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{mvn-version}'
+          description: 'Maven selector to be used by shell scripts'
       - string:
           name: MAVEN_OPTS
           default: '{mvn-opts}'
@@ -306,10 +281,20 @@
               https://www.python.org/dev/peps/pep-0440/
               For example '<1.0.0' or '>=1.0.0,<2.0.0'.
 
+- parameter:
+    name: lf-infra-node-parameters
+    parameters:
+      - string:
+          name: NODE_DIR
+          default: '{node-dir}'
+          description: Path to a Node project directory.
+      - string:
+          name: NODE_VERSION
+          default: '{node-version}'
+          description: Version of NodeJS to install.
+
 - parameter:
     name: lf-infra-tox-parameters
-    # Useful parameters when working with TOX
-    # https://tox.readthedocs.io/
     parameters:
       - string:
           name: TOX_DIR