X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Finclude-raw-autorelease-maven-deploy.sh;h=164349923d50221307ce44e53b760c2a3bd13fd9;hb=a755f99e013c1422ebfe032a319f355c91552c76;hp=d41d2693ad60d2f654ae73356dba993b7d61ce90;hpb=e0de0eeb4cb60dede6c87c746888640b5b27ea0d;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index d41d2693a..164349923 100644
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -9,42 +9,30 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-# Job will pass in a variable ${DATESTAMP} if this variable is false than we
-# we are likely releasing a release candidate. We should skip closing the
-# Nexus staging repository so that we can sign the artifacts.
-SKIP_STAGING_CLOSE=false
-if [ "${DATESTAMP}" == "false" ]
-then
-    SKIP_STAGING_CLOSE=true
-fi
-
-mkdir -p hide/from/pom/files
-cd hide/from/pom/files
+# Assuming that mvn deploy created the hide/from/pom/files/stage directory.
+cd hide/from/pom/files || exit 1
 mkdir -p m2repo/org/opendaylight/
 
-(IFS='
-'
-for m in `xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' ../../../../pom.xml`; do
-    rsync -avz --exclude 'maven-metadata-local.xml' \
-               --exclude 'maven-metadata-*' \
-               --exclude '_remote.repositories' \
-               --exclude 'resolver-status.properties' \
-               "/tmp/r/org/opendaylight/$m" m2repo/org/opendaylight/
-done)
+# ODLNEXUSPROXY is used to define the location of the Nexus server used by the CI system.
+# by default it should be set to https://nexus.opendaylight.org
+# in cases where an internal ci system is using multiple NEXUS systems one for artifacts and another for staging,
+# we can override using ODLNEXUS_STAGING_URL to route the staging build to the 2nd server.
+# (most CI setups where a single Nexus server is used, ODLNEXUS_STAGING_URL should be left unset)
+NEXUS_STAGING_URL=${ODLNEXUS_STAGING_URL:-"http://10.29.8.46:8081"}
+NEXUS_STAGING_PROFILE=${ODLNEXUS_STAGING_PROFILE:-425e43800fea70}
+NEXUS_STAGING_SERVER_ID=${ODLNEXUS_STAGING_SERVER_ID:-"opendaylight.staging"}
 
-# Add exception for integration project since they release under the
-# integration top-level project.
-rsync -avz --exclude 'maven-metadata-local.xml' \
-           --exclude 'maven-metadata-*' \
+rsync -avz --remove-source-files \
+           --exclude 'maven-metadata*' \
            --exclude '_remote.repositories' \
            --exclude 'resolver-status.properties' \
-           "/tmp/r/org/opendaylight/integration" m2repo/org/opendaylight/
+           "stage/org/opendaylight" m2repo/org/
 
-mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
-    -DskipStagingRepositoryClose=${SKIP_STAGING_CLOSE}
-    -DrepositoryDirectory="`pwd`/m2repo" \
-    -DnexusUrl=http://nexus.opendaylight.org/ \
-    -DstagingProfileId="425e43800fea70" \
-    -DserverId="opendaylight.staging" \
-    -s $SETTINGS_FILE \
-    -gs $GLOBAL_SETTINGS_FILE | tee $WORKSPACE/deploy-staged-repository.log
+"$MVN" -V -B org.sonatype.plugins:nexus-staging-maven-plugin:1.6.8:deploy-staged-repository \
+    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+    -DrepositoryDirectory="$(pwd)/m2repo" \
+    -DnexusUrl="$NEXUS_STAGING_URL" \
+    -DstagingProfileId="$NEXUS_STAGING_PROFILE" \
+    -DserverId="$NEXUS_STAGING_SERVER_ID" \
+    -s "$SETTINGS_FILE" \
+    -gs "$GLOBAL_SETTINGS_FILE" | tee "$WORKSPACE/deploy-staged-repository.log"