X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=06f08f44c5f966de227b349410dbaafab9411b22;hb=9e8bc48869a;hp=8961184f278e86fbf6b7175bf8057656b4a4e315;hpb=30fb028f8fe8376c690c2e0b4e82597a8a66ea05;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 8961184f..06f08f44 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -70,6 +70,16 @@
           files:
             - file-id: "jenkins-log-archives-settings"
               variable: "SETTINGS_FILE"
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^.*logs-s3.*"
+          label: $S3_BUCKET
+          on-evaluation-failure: dont-run
+          steps:
+            - config-file-provider:
+                files:
+                  - file-id: "jenkins-s3-log-ship"
+                    target: $HOME/.aws/credentials
       - lf-infra-create-netrc:
           server-id: logs
       - shell: !include-raw:
@@ -85,7 +95,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
@@ -213,6 +223,30 @@
             - shell: !include-raw-escape: ../shell/maven-central.sh
             - lf-provide-maven-settings-cleanup
 
+- builder:
+    name: lf-packagecloud-file-provider
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: ".packagecloud"
+              target: "$HOME/.packagecloud"
+      - config-file-provider:
+          files:
+            - file-id: "packagecloud_api"
+              target: "$HOME/packagecloud_api"
+
+- builder:
+    name: lf-packagecloud-push
+    builders:
+      - inject:
+          properties-content: |
+            BUILD_DIR={build-dir}
+            PACKAGECLOUD_ACCOUNT={packagecloud-account}
+            PACKAGECLOUD_REPO={packagecloud-repo}
+            DEBIAN_DISTRIBUTION_VERSIONS={debian-distribution-versions}
+            RPM_DISTRIBUTION_VERSIONS={rpm-distribution-versions}
+      - shell: !include-raw-escape: ../shell/packagecloud-push.sh
+
 - builder:
     name: lf-maven-install
     builders: