From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 24 Jul 2018 17:03:56 +0000 (-0400)
Subject: Fix GitHub templates override lf-infra-properties
X-Git-Tag: v0.23.0~3
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=b788ff5c5fdd15bf913b546f451a2045d446d054;p=releng%2Fglobal-jjb.git

Fix GitHub templates override lf-infra-properties

When redefining any Jenkins section we must redefine everything
that is being overrided otherwise previous configuration will
be lost. This patch fixes the build-days-to-keep parameter that
is lost in the GitHub jobs due to the github property override.

Change-Id: I8a127344189215367c3546d0b3222d989ea74800
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 0c2ae334..b00b57e9 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -376,6 +376,9 @@
     <<: *lf_jenkins_cfg_merge
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 1
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -495,6 +498,9 @@
     <<: *lf_jjb_deploy_job
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 1
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -584,6 +590,9 @@
     #####################
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 7
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -698,6 +707,9 @@
     #####################
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 7
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -824,6 +836,8 @@
     <<: *lf_license_check
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -1029,6 +1043,9 @@
     #####################
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 7
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -1158,6 +1175,9 @@
     #####################
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 7
       - github:
           url: '{git-url}/{github-org}/{project}'
 
diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 5e33b897..0d777553 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -237,6 +237,8 @@
     <<: *lf_maven_clm
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -352,6 +354,8 @@
     <<: *lf_maven_javadoc_publish
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -466,6 +470,8 @@
     <<: *lf_maven_javadoc_verify
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -598,6 +604,8 @@
     <<: *lf_maven_merge
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -714,6 +722,8 @@
     <<: *lf_maven_release
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -864,6 +874,8 @@
     <<: *lf_maven_sonar
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -988,6 +1000,8 @@
     <<: *lf_maven_verify
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml
index 106fbdc7..44be4428 100644
--- a/jjb/lf-node-jobs.yaml
+++ b/jjb/lf-node-jobs.yaml
@@ -130,6 +130,8 @@
     <<: *lf_node_verify
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index f95f575a..a32a4873 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -189,6 +189,8 @@
     <<: *lf_python_xc_clm
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -364,6 +366,8 @@
     <<: *lf_tox_sonar
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -510,6 +514,8 @@
     <<: *lf_tox_verify
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index dd6301df..eb2382a3 100644
--- a/jjb/lf-rtd-jobs.yaml
+++ b/jjb/lf-rtd-jobs.yaml
@@ -128,6 +128,8 @@
     <<: *lf_rtd_merge
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -223,6 +225,8 @@
     <<: *lf_rtd_verify
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'