Rename Maven settings variables to match yangtools

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 3352362c3ef98200046d34c4881ba987d49b5afc..30dc6ddf86b6fa7383a7b08e82f346ffd144c6ef 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -94,9 +94,9 @@
         - config-file-provider:
             files:
                 - file-id: '{autorelease-settings}'
-                  variable: 'AUTORELEASE_SETTINGS'
+                  variable: 'SETTINGS_FILE'
                 - file-id: '{odl-global-settings}'
-                  variable: 'ODL_GLOBAL_SETTINGS'
+                  variable: 'GLOBAL_SETTINGS_FILE'
 
 - builder:
     name: autorelease-maven-deploy

diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index ac21d5fcb36b6e5cca3669fb5bfffe4430d0b956..402b90a4e0944b5345e9e9fc49534d9f3165f298 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -36,5 +36,5 @@ mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-reposito
     -DnexusUrl=http://nexus.opendaylight.org/ \
     -DstagingProfileId="425e43800fea70" \
     -DserverId="opendaylight.staging" \
-    -s $AUTORELEASE_SETTINGS \
-    -gs $ODL_GLOBAL_SETTINGS | tee $WORKSPACE/deploy-staged-repository.log
+    -s $SETTINGS_FILE \
+    -gs $GLOBAL_SETTINGS_FILE | tee $WORKSPACE/deploy-staged-repository.log