Fix build discarder config for all fd.io projects

- Existing build discard configuration is no
  longer generating build discarder config in jjb.
  Use lf-infra-properties macro instead.

Change-Id: I2e6aabefd4a5a74877c4ba02c1f06f3f120bea69
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

16 files changed, 164 insertions, 285 deletions

diff --git a/jjb/ci-management/packagecloud-repo-cleanup.yaml b/jjb/ci-management/packagecloud-repo-cleanup.yaml
index 517c2cc7..642ee2b2 100644
--- a/jjb/ci-management/packagecloud-repo-cleanup.yaml
+++ b/jjb/ci-management/packagecloud-repo-cleanup.yaml
@@ -37,11 +37,9 @@
     node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -101,11 +99,9 @@
     node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index 26ecfa23..6ba90711 100644
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -90,11 +90,9 @@
     project-type: freestyle
     node: "builder-{os}-prod-{executor-arch}"
 
-    build-discarder:
-      daysToKeep: "{build-days-to-keep}"
-      numToKeep: "{build-num-to-keep}"
-      artifactDaysToKeep: "{build-artifact-days-to-keep}"
-      artifactNumToKeep: "{build-artifact-num-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -166,11 +164,9 @@
     node: "builder-{os}-prod-{executor-arch}"
     concurrent: true
 
-    build-discarder:
-      daysToKeep: "{build-days-to-keep}"
-      numToKeep: "{build-num-to-keep}"
-      artifactDaysToKeep: "{build-artifact-days-to-keep}"
-      artifactNumToKeep: "{build-artifact-num-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -210,11 +206,9 @@
     project-type: freestyle
     node: "builder-{os}-prod-{executor-arch}"
 
-    build-discarder:
-      daysToKeep: "{build-days-to-keep}"
-      numToKeep: "{build-num-to-keep}"
-      artifactDaysToKeep: "{build-artifact-days-to-keep}"
-      artifactNumToKeep: "{build-artifact-num-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -289,11 +283,9 @@
     node: "builder-{os}-prod-{executor-arch}"
     concurrent: true
 
-    build-discarder:
-      daysToKeep: "{build-days-to-keep}"
-      numToKeep: "{build-num-to-keep}"
-      artifactDaysToKeep: "{build-artifact-days-to-keep}"
-      artifactNumToKeep: "{build-artifact-num-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 2d1008a4..bef5db12 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -389,11 +389,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -471,11 +469,9 @@
     concurrent: false
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -538,11 +534,9 @@
     concurrent: false
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -604,11 +598,9 @@
     concurrent: false
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -680,11 +672,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -778,11 +768,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -852,11 +840,9 @@
     concurrent: false
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -933,11 +919,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -1024,11 +1008,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -1115,11 +1097,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -1206,11 +1186,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index fd2d1cc1..b2025873 100644
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -40,11 +40,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index b84ef73c..50b87459 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -82,11 +82,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -141,11 +139,9 @@
     concurrent: false
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -191,11 +187,9 @@
     concurrent: false
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 77406ca8..96569d18 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -57,11 +57,9 @@
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -120,11 +118,9 @@
     concurrent: false
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -179,11 +175,9 @@
     node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -231,11 +225,9 @@
     node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index b4998a3a..3624ca8f 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -5,9 +5,6 @@
     name: global
 
     build-days-to-keep: 30
-    build-num-to-keep: 40
-    build-artifact-days-to-keep: -1
-    build-artifact-num-to-keep: 5
     # Timeout in minutes
     build-timeout: 360
     build-perf-timeout: 5760
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 261705f6..f9199da6 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -811,13 +811,6 @@
       - shell: |
           $WORKSPACE/scripts/check-unicode.sh jjb/
 
-- property:
-    name: fdio-infra-properties
-    properties:
-      - build-discarder:
-          days-to-keep: '{build-days-to-keep}'
-          num-to-keep: '{build-num-to-keep}'
-
 - builder:
     name: fdio-infra-ship-docs
     builders:
diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index c8ac1d81..27a14634 100644
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -36,11 +36,9 @@
     concurrent: true
     jdk: openjdk8-{os}
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -87,11 +85,9 @@
     node: '{os}-builder-4c-4g'
     jdk: openjdk8-{os}
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -152,11 +148,9 @@
     node: '{os}-builder-4c-4g'
     jdk: openjdk8-{os}
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/hicn/hicn-docs.yaml b/jjb/hicn/hicn-docs.yaml
index d1bde288..c428a222 100644
--- a/jjb/hicn/hicn-docs.yaml
+++ b/jjb/hicn/hicn-docs.yaml
@@ -36,11 +36,9 @@
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: "{build-days-to-keep}"
-      numToKeep: "{build-num-to-keep}"
-      artifactDaysToKeep: "{build-artifact-days-to-keep}"
-      artifactNumToKeep: "{build-artifact-num-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -110,11 +108,9 @@
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: "{build-days-to-keep}"
-      numToKeep: "{build-num-to-keep}"
-      artifactDaysToKeep: "{build-artifact-days-to-keep}"
-      artifactNumToKeep: "{build-artifact-num-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 7ffe09f4..1dc6d44c 100644
--- a/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@ -204,11 +204,9 @@
     concurrent: true
     archive-artifacts: "**/tmp/hicn-failed-unittests/*/* **/core"
 
-    build-discarder:
-      daysToKeep: "{build-days-to-keep}"
-      numToKeep: "{build-num-to-keep}"
-      artifactDaysToKeep: "{build-artifact-days-to-keep}"
-      artifactNumToKeep: "{build-artifact-num-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -293,11 +291,9 @@
     node: "builder-{os}-prod-{executor-arch}"
     concurrent: true
 
-    build-discarder:
-      daysToKeep: "{build-days-to-keep}"
-      numToKeep: 100
-      artifactDaysToKeep: "{build-artifact-days-to-keep}"
-      artifactNumToKeep: "{build-artifact-num-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -347,11 +343,9 @@
     project-type: freestyle
     node: "builder-{os}-prod-{executor-arch}"
 
-    build-discarder:
-      daysToKeep: "{build-days-to-keep}"
-      numToKeep: 100
-      artifactDaysToKeep: "{build-artifact-days-to-keep}"
-      artifactNumToKeep: "{build-artifact-num-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -445,11 +439,9 @@
     node: "builder-{os}-prod-{executor-arch}"
     concurrent: true
 
-    build-discarder:
-      daysToKeep: "{build-days-to-keep}"
-      numToKeep: 100
-      artifactDaysToKeep: "{build-artifact-days-to-keep}"
-      artifactNumToKeep: "{build-artifact-num-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -507,11 +499,9 @@
     project-type: freestyle
     node: "builder-{os}-prod-{executor-arch}"
 
-    build-discarder:
-      daysToKeep: "{build-days-to-keep}"
-      numToKeep: 100
-      artifactDaysToKeep: "{build-artifact-days-to-keep}"
-      artifactNumToKeep: "{build-artifact-num-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 45cb3545..9a2638ba 100644
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -43,11 +43,9 @@
     node: '{os}-builder-4c-4g'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -90,11 +88,9 @@
     node: '{os}-builder-4c-4g'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -148,11 +144,9 @@
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/udpi/udpi.yaml b/jjb/udpi/udpi.yaml
index 14b7b69a..2d4ece92 100644
--- a/jjb/udpi/udpi.yaml
+++ b/jjb/udpi/udpi.yaml
@@ -48,11 +48,9 @@
     node: 'builder-{os}-prod-x86_64'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -116,11 +114,9 @@
     project-type: freestyle
     node: 'builder-{os}-prod-x86_64'
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 94de3dea..18975498 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -39,11 +39,9 @@
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -112,11 +110,9 @@
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -197,11 +193,9 @@
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -267,11 +261,9 @@
     only-if-success: true
     default-excludes: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index db465333..7fa77d95 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -408,11 +408,8 @@
     node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties
 
     # Please keep parameters in alphabetical order
     parameters:
@@ -523,11 +520,9 @@
     node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     # Please keep parameters in alphabetical order
     parameters:
@@ -589,11 +584,9 @@
     node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     # Please keep parameters in alphabetical order
     parameters:
@@ -656,11 +649,9 @@
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     # Please keep parameters in alphabetical order
     parameters:
@@ -735,11 +726,9 @@
     node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     # Please keep parameters in alphabetical order
     parameters:
@@ -812,11 +801,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     # Please keep parameters in alphabetical order
     parameters:
@@ -894,11 +881,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     # Please keep parameters in alphabetical order
     parameters:
@@ -978,11 +963,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     # Please keep parameters in alphabetical order
     parameters:
@@ -1068,11 +1051,9 @@
     concurrent: true
     latest-only: false
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     # Please keep parameters in alphabetical order
     parameters:
diff --git a/jjb/vsap/vsap.yaml b/jjb/vsap/vsap.yaml
index 2011336d..6b59eecb 100644
--- a/jjb/vsap/vsap.yaml
+++ b/jjb/vsap/vsap.yaml
@@ -48,11 +48,9 @@
     node: 'builder-{os}-prod-x86_64'
     concurrent: true
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -105,11 +103,9 @@
     project-type: freestyle
     node: 'builder-{os}-prod-x86_64'
 
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter: