Fix rsync script not picking up subprojects correctly

Patch the rsync script to pick up subprojects in the correct path. This
patch actually simplifies the rsync script to pull all of
org/opendaylight rather than looping each project.

Originally we were rsyncing from ~/.m2/repository so it was necessary to
run the loop to ensure we only pick up projects built by autorelease as
at one time the ODL CI was sharing the local maven repo and build
minions were reused so could accidently pick up old build artifacts.
This is no longer the case.

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

diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index 90861b94b94d84da91177bd22ec0dc08b778d923..630a2206c67e56fff3fa2725a72abd75a860d6fa 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -13,21 +13,10 @@
 cd hide/from/pom/files
 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*' \
-               --exclude '_remote.repositories' \
-               --exclude 'resolver-status.properties' \
-               "stage/org/opendaylight/$m" m2repo/org/opendaylight/
-done)
-
-# Add exception for integration project since they release under the
-# integration top-level project.
 rsync -avz --exclude 'maven-metadata*' \
            --exclude '_remote.repositories' \
            --exclude 'resolver-status.properties' \
-           "stage/org/opendaylight/integration" m2repo/org/opendaylight/
+           "stage/org/opendaylight" m2repo/org/
 
 "$MVN" -V -B org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
     -DrepositoryDirectory="`pwd`/m2repo" \