From: Luis Gomez <ecelgp@gmail.com>
Date: Sun, 7 Nov 2021 20:31:14 +0000 (-0800)
Subject: Use project settings when uploading distribution
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9e2fcda3f9f1163ab8552e7550ae7a9999ae2c07;p=releng%2Fbuilder.git

Use project settings when uploading distribution

Change-Id: Ib04fae27a44d4d0204911022f1aa5ec921ae706a
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 477735a4f..328099652 100644
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -109,6 +109,7 @@
       - distribution-check-warn-9192
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
+          settings-project: integration
       - distribution-check-bootup
 
       - trigger-builds:
@@ -382,6 +383,7 @@
       - distribution-check-warn-9192
       - integration-upload-distribution:
           dist-pom: "{dist-pom}"
+          settings-project: integration
       - distribution-check-bootup
 
     publishers:
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 4f4718e5d..1e2abb3f4 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -469,7 +469,7 @@
           files:
             - file-id: global-settings
               variable: GLOBAL_SETTINGS_FILE
-            - file-id: integration-settings
+            - file-id: "{settings-project}-settings"
               variable: SETTINGS_FILE
       - integration-set-variables
       - inject:
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index e787fdef6..af442d6c9 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1923,6 +1923,7 @@
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: "{project}/pom.xml"
+          settings-project: "{project}"
       - trigger-builds:
           - project: "{csit-list}"
             block: true
@@ -2039,6 +2040,7 @@
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
+          settings-project: integration
       - trigger-builds:
           - project: "{csit-list}"
             block: true
diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 57d1c586e..17eb89ccb 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -347,6 +347,7 @@
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
+          settings-project: integration
       - trigger-builds:
           - project: "{csit-list}"
             block: true
@@ -447,6 +448,7 @@
       - integration-multipatch-builder
       - integration-upload-distribution:
           dist-pom: patch_tester/distribution/pom.xml
+          settings-project: integration
       - conditional-step:
           condition-kind: boolean-expression
           condition-expression: $RUN_TEST