X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=08bb637c482146a23b20de7855a9411692bd2fbf;hb=f9e0c6aa3c19f8fc5c017f8a84e203d0d50d5b7f;hp=04d5e37b794fe663f474d733675917212437027a;hpb=79c376c000d2996608b172d1a970f89a93ceff4d;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 04d5e37b..08bb637c 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -56,6 +56,8 @@
 - builder:
     name: lf-infra-ship-logs
     builders:
+      # Ensure no pre-existing .netrc files are overriding logs config
+      - lf-provide-maven-settings-cleanup
       - config-file-provider:
           files:
             - file-id: 'jenkins-log-archives-settings'
@@ -171,11 +173,23 @@
               GROUP_ID={group-id}
               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
 
+- builder:
+    name: lf-maven-central
+    builders:
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: '{mvn-central}'
+          steps:
+            - lf-infra-create-netrc:
+                server-id: 'ossrh'
+            - inject:
+                properties-content: 'OSSRH_PROFILE_ID={ossrh-profile-id}'
+            - shell: !include-raw-escape: ../shell/maven-central.sh
+
 - builder:
     name: lf-maven-install
     builders:
@@ -405,15 +419,6 @@
 
               If using GitHub, in a manual build override with a branch path or
               sha1 hash to a specific commit. For example: 'origin/master'
-      # Tools
-      - 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