X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=9aa05e083e16b455c13e59c717b5b881aea8e72e;hb=refs%2Fchanges%2F34%2F9634%2F4;hp=562168ac03d7ee28d5baaaa1de43faa8b66aac8a;hpb=391e8138f528a720604ed9da7bda949b5e56fbec;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 562168ac..9aa05e08 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -137,6 +137,20 @@
             - file-id: '{settings-file}'
               variable: 'SETTINGS_FILE'
 
+- builder:
+    name: lf-provide-sigul-configuration
+    # Push configuration files to interact with sigul
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: sigul-config
+              variable: SIGUL_CONFIG
+            - file-id: sigul-password
+              variable: SIGUL_PASSWORD
+            - file-id: sigul-pki
+              variable: SIGUL_PKI
+      - shell: !include-raw-escape: ../shell/sigul-configuration.sh
+
 - builder:
     name: lf-pip-install
     builders:
@@ -161,11 +175,21 @@
           # DO NOT fail build if any of the above lines fail.
           exit 0
 
+- builder:
+    name: lf-provide-sigul-configuration-cleanup
+    # Clear sigul configuration files after we're done using them
+    builders:
+      - shell: !include-raw-escape: ../shell/sigul-configuration-cleanup.sh
+
 - builder:
     name: lf-rtd-trigger-build
     builders:
       - inject:
-          properties-content: RTD_PROJECT={rtd-project}
+          properties-content: |
+            RTD_PROJECT={rtd-project}
+            RTD_BUILD_URL={rtd-build-url}
+            SETTINGS_FILE={global-settings-file}
+            SERVER_ID={rtd-server-id}
       - shell: !include-raw-escape: ../shell/rtd-trigger-build.sh
 
 - builder:
@@ -177,6 +201,13 @@
           - ../shell/tox-install.sh
           - ../shell/rtd-verify.sh
 
+- builder:
+    name: lf-sigul-install
+    # Requires that Jenkins be configured with SIGUL_BRIDGE_IP as a global
+    # Environment variable
+    builder:
+      - shell: !include-raw-escape: ../shell/sigul-install.sh
+
 ##############
 # PARAMETERS #
 ##############
@@ -184,6 +215,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}'
@@ -198,6 +235,7 @@
           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.
+          # yamllint disable-line rule:line-length
           default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{mvn-version}/bin/mvn'
           description: 'Maven selector to be used by shell scripts'
       - string:
@@ -327,6 +365,7 @@
           exec-pattern: "**/**.exec"
           class-pattern: "**/classes"
           source-pattern: "**/src/main/java"
+          # yamllint disable-line rule:line-length
           exclusion-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**"
           status-update: true
           targets:
@@ -347,11 +386,17 @@
     publishers:
       - postbuildscript:
           builders:
-            - lf-infra-sysstat
-            - lf-infra-ship-logs
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: false
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - lf-infra-sysstat
+                - lf-infra-ship-logs
+          mark-unstable-if-failed: true
       - workspace-cleanup:
           exclude:
             # Do not clean up *.jenkins-trigger files for jobs that use a
@@ -385,6 +430,8 @@
           credentials-id: '{jenkins-ssh-credential}'
           url: '{url}'
           refspec: '{refspec}'
+          branches:
+            - '{branch}'
           skip-tag: true
           wipe-workspace: true
           submodule:
@@ -429,3 +476,9 @@
             - '{jenkins-ssh-credential}'
       - openstack:
           single-use: true
+      - config-file-provider:
+          files:
+            - file-id: npmrc
+              target: '$HOME/.npmrc'
+            - file-id: pipconf
+              target: '$HOME/.config/pip/pip.conf'