X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=22ca75852ec02a0cdc772482e329e940a334cfda;hb=228fd6f92c633917139146271f8d8327ca11bffa;hp=310e0fe1c8edf03a87abab6cff25c2416dd22f3b;hpb=04163ad187f5da1063953ff301da2761c65d304e;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 310e0fe1..22ca7585 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -76,7 +76,7 @@
     builders:
       - config-file-provider:
           files:
-            - file-id: packer-cloud-env
+            - file-id: '{packer-cloud-settings}'
               variable: CLOUDENV
       - inject:
           properties-content: |
@@ -94,7 +94,7 @@
     builders:
       - config-file-provider:
           files:
-            - file-id: 'packer-cloud-env'
+            - file-id: '{packer-cloud-settings}'
               variable: 'CLOUDENV'
       - inject:
           properties-content: |
@@ -132,11 +132,13 @@
           settings-file: '{settings-file}'
       - inject:
           properties-content: |
+              MAVEN_REPO_URL={maven-repo-url}
               REPO_ID={repo-id}
               GROUP_ID={group-id}
-              UPLOAD_FILES_PATH={files-dir}
+              UPLOAD_FILES_PATH={upload-files-dir}
       - shell: !include-raw-escape:
           - ../shell/lftools-install.sh
+          - ../shell/common-variables.sh
           - ../shell/deploy-maven-file.sh
       - lf-provide-maven-settings-cleanup
 
@@ -163,6 +165,15 @@
             - file-id: '{settings-file}'
               variable: 'SETTINGS_FILE'
 
+- 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}
+      - shell: !include-raw-escape: ../shell/pip-install.sh
+
 - builder:
     name: lf-provide-maven-settings-cleanup
     # Clear maven settings files after we are done using them
@@ -181,6 +192,22 @@
           # DO NOT fail build if any of the above lines fail.
           exit 0
 
+- builder:
+    name: lf-rtd-trigger-build
+    builders:
+      - inject:
+          properties-content: RTD_PROJECT={rtd-project}
+      - shell: !include-raw-escape: ../shell/rtd-trigger-build.sh
+
+- builder:
+    name: lf-rtd-verify
+    builders:
+      - inject:
+          properties-content: DOC_DIR={doc-dir}
+      - shell: !include-raw-escape:
+          - ../shell/tox-install.sh
+          - ../shell/rtd-verify.sh
+
 ##############
 # PARAMETERS #
 ##############
@@ -264,13 +291,33 @@
               job is triggered by Gerrit.
       - string:
           name: GERRIT_REFSPEC
-          default: ''
+          default: 'refs/heads/{branch}'
           description: |
               Parameter to identify a refspec when pulling from Gerrit.
 
               Note that Gerrit will override this parameter automatically if a
               job is triggered by Gerrit.
+      - string:
+          name: LFTOOLS_VERSION
+          default: '{lftools-version}'
+          description: |
+              Version of lftools to install. Can be a specific version like
+              '0.6.0' or a PEP-440 definition.
+              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 for NodeJS
+    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
@@ -307,6 +354,23 @@
 # PUBLISHERS #
 ##############
 
+- publisher:
+    name: lf-jacoco-report
+    publishers:
+      - jacoco:
+          exec-pattern: "**/**.exec"
+          class-pattern: "**/classes"
+          source-pattern: "**/src/main/java"
+          exclusion-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**"
+          status-update: true
+          targets:
+            - branch:
+                healthy: 10
+                unhealthy: 20
+            - method:
+                healthy: 50
+                unhealthy: 40
+
 - publisher:
     name: lf-infra-publish
     # lf-infra macro to finish up a build.