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 477735a4f9d52fcef0fc7946cec9ad065accbc84..328099652f0a7f74f673e780b8335932ed7b4f96 100644 (file)
--- 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 4f4718e5d6d4711e1abf804719ab03dea283dc1a..1e2abb3f4d8c1bdf574a21ddb0efa3edfef828ba 100644 (file)
--- 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 e787fdef66bcbc233b89cfdccf67f6012e1bf3f5..af442d6c9ba8e57ff336a2d2367cca0cc4596f67 100644 (file)
--- 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 57d1c586eb8c53e5d78d5b03f0e852c41ae543fb..17eb89ccbb7d79507cb213241a196987c14c394b 100644 (file)
--- 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