From d347f6272119ee58608a96bb204840c15842f6d5 Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Mon, 30 Aug 2021 16:32:26 -0400
Subject: 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>
---
 jjb/hicn/hicn.yaml | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

(limited to 'jjb/hicn/hicn.yaml')

diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 7ffe09f42..1dc6d44cc 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:
-- 
cgit 1.2.3-korg