X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=b1875d2a74e2b574e687267a6cc66a07324a944b;hb=fa8e5cf8e42ef69b975ec1eab827f06425eab9ea;hp=bf0b3faba20ce17d1140de8f1a5364bc3ca83b2b;hpb=5f79451fbde6689fd5b43f3d085b2766022f669e;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index bf0b3fab..b1875d2a 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -31,6 +31,12 @@
       - shell: !include-raw-escape:
           - ../shell/license-check.sh
 
+- builder:
+    name: lf-infra-capture-instance-metadata
+    builders:
+      - shell: !include-raw:
+          - ../shell/capture-instance-metadata.sh
+
 - builder:
     name: lf-infra-create-netrc
     builders:
@@ -74,6 +80,7 @@
           condition-kind: regex-match
           regex: "^.*logs-s3.*"
           label: $S3_BUCKET
+          on-evaluation-failure: dont-run
           steps:
             - config-file-provider:
                 files:
@@ -94,7 +101,7 @@
       - shell: !include-raw:
           - ../shell/logs-clear-credentials.sh
       - description-setter:
-          regexp: "^Build logs: .*"
+          regexp: "(^(Nexus|S3) build logs: .*)"
 
 - builder:
     name: lf-infra-package-listing
@@ -393,6 +400,29 @@
 # PARAMETERS #
 ##############
 
+- parameter:
+    name: lf-autotools-parameters
+    # Parameters for configure-make builds.
+    parameters:
+      - string:
+          name: CONFIGURE_OPTS
+          default: "{configure-opts}"
+          description: |
+            Options to pass to configure.
+            Example: --build=i686-pc-linux-gnu
+      - string:
+          name: INSTALL_PREFIX
+          default: "{install-prefix}"
+          description: |
+            Install prefix for configure.
+            Usually a workspace subdirectory.
+      - string:
+          name: MAKE_OPTS
+          default: "{make-opts}"
+          description: |
+            Options to pass to make.
+            Example: -j8 all
+
 - parameter:
     name: lf-clm-parameters
     parameters:
@@ -631,6 +661,7 @@
               build-steps:
                 - lf-infra-sysstat
                 - lf-infra-package-listing
+                - lf-infra-capture-instance-metadata
                 - lf-infra-ship-logs
           mark-unstable-if-failed: true
       - workspace-cleanup: