From c8bbf75c4726e4d9ad8f1892d8a4e76520d96086 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 27 Nov 2018 16:04:55 +0800
Subject: [PATCH] Consolidate mvn-settings configuration in AR

Update autorelease templates to use LF standard practice for
mvn-settings configuration.

Change-Id: Iac41cc915d810b5289a96f27d4368c8abf434152
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/autorelease/autorelease-macros.yaml    | 10 -----
 jjb/autorelease/autorelease-templates.yaml | 46 +++++++++++++++-------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index b9edf7feb..a119315b2 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -39,16 +39,6 @@
               git clean -dff
           fi
 
-- builder:
-    name: autorelease-cfp
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'autorelease-settings'
-              variable: 'SETTINGS_FILE'
-            - file-id: 'global-settings'
-              variable: 'GLOBAL_SETTINGS_FILE'
-
 - builder:
     name: autorelease-determine-merge-order
     builders:
diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index db905e30f..08688d812 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -62,6 +62,8 @@
     build-node: '{build-node}'
     cron: 'H 0 * * *'
     java-version: openjdk8
+    mvn-global-settings: global-settings
+    mvn-settings: autorelease-settings
     mvn-version: mvn35
     extra-mvn-opts: ''
 
@@ -138,9 +140,9 @@
       - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
-      - autorelease-cfp:
-          autorelease-settings: 'autorelease-settings'
-          global-settings: 'odl-global-settings'
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
       - lf-infra-create-netrc:
           server-id: '{mvn-staging-id}'
       - autorelease-generate-release-patches
@@ -165,17 +167,17 @@
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: 'autorelease-settings'
+          settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: '{mvn-global-settings}'
           global-settings-type: cfp
       - lf-maven-stage
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
           maven-version: '{mvn-version}'
-          settings: 'autorelease-settings'
-          global-settings: 'global-settings'
+          settings: '{mvn-settings}'
+          global-settings: '{mvn-global-settings}'
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_
@@ -353,6 +355,18 @@
 
 - job-template:
     name: autorelease-version-bump-{stream}
+
+    #####################
+    # Default variables #
+    #####################
+
+    mvn-global-settings: global-settings
+    mvn-settings: autorelease-settings
+
+    #####################
+    # Job configuration #
+    #####################
+
     project-type: freestyle
     node: '{build-node}'
 
@@ -411,11 +425,13 @@
       - maven-target:
           maven-version: mvn35
           goals: '-version'
-          settings: autorelease-settings
+          settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: global-settings
+          global-settings: '{mvn-global-settings}'
           global-settings-type: cfp
-      - autorelease-cfp
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
       - shell: !include-raw-escape:
           - version-bump.sh
 
@@ -495,6 +511,8 @@
     ############
 
     java-version: openjdk8
+    mvn-global-settings: global-settings
+    mvn-settings: autorelease-settings
 
     #####################
     # Job Configuration #
@@ -572,9 +590,9 @@
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g'
-          settings: autorelease-settings
+          settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: global-settings
+          global-settings: '{mvn-global-settings}'
           global-settings-type: cfp
       - maven-target:
           maven-version: mvn35
@@ -585,9 +603,9 @@
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: autorelease-settings
+          settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: global-settings
+          global-settings: '{mvn-global-settings}'
           global-settings-type: cfp
       - shell: |
           mkdir -p archives/
-- 
2.36.6