Improve excludes rules for Maven metadata

[releng/builder.git] / jjb / autorelease / include-raw-autorelease-maven-deploy.sh

diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index d41d2693ad60d2f654ae73356dba993b7d61ce90..eb614b23b3dc9be556353f3fced9292e8c0a732a 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -13,10 +13,13 @@
 # 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
+# TODO: Figure out a solution to Open staging repos not being available
+#       immediately. This means integration tests cannot reliably download and
+#       test the new build if we leave the staging repo open.
+# if [ "${DATESTAMP}" == "false" ]
+# then
+#     SKIP_STAGING_CLOSE=true
+# fi
 
 mkdir -p hide/from/pom/files
 cd hide/from/pom/files
@@ -25,8 +28,7 @@ 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-*' \
+    rsync -avz --exclude 'maven-metadata*' \
                --exclude '_remote.repositories' \
                --exclude 'resolver-status.properties' \
                "/tmp/r/org/opendaylight/$m" m2repo/org/opendaylight/
@@ -34,14 +36,13 @@ done)
 
 # 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 --exclude 'maven-metadata*' \
            --exclude '_remote.repositories' \
            --exclude 'resolver-status.properties' \
            "/tmp/r/org/opendaylight/integration" m2repo/org/opendaylight/
 
 mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
-    -DskipStagingRepositoryClose=${SKIP_STAGING_CLOSE}
+    -DskipStagingRepositoryClose=${SKIP_STAGING_CLOSE} \
     -DrepositoryDirectory="`pwd`/m2repo" \
     -DnexusUrl=http://nexus.opendaylight.org/ \
     -DstagingProfileId="425e43800fea70" \