svn commit: r1370518 - in /lucene/dev/trunk: build.xml dev-tools/scripts/smokeTestRelease.py

[rm...@apache.org]

Author: rmuir
Date: Tue Aug  7 20:58:46 2012
New Revision: 1370518

URL: http://svn.apache.org/viewvc?rev=1370518&view=rev
Log:
LUCENE-4295: add task to build and smoke-test a release for the nightly build

Modified:
    lucene/dev/trunk/build.xml
    lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py

Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1370518&r1=1370517&r2=1370518&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Tue Aug  7 20:58:46 2012
@@ -184,4 +184,49 @@
       </subant>
     </sequential>
   </target>
+
+  <property name="python32.exe" value="python3.2" />
+  <property name="JAVA6_HOME" value="/usr/local/jdk1.6.0_27"/>
+  <property name="JAVA7_HOME" value="/usr/local/jdk1.7.0_01"/>
+  <property name="fakeRelease" value="lucene/build/fakeRelease"/>
+  <property name="fakeReleaseTmp" value="lucene/build/fakeReleaseTmp"/>
+  <property name="fakeReleaseVersion" value="5.0"/> <!-- *not* -SNAPSHOT, the real version -->
+
+  <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it." depends="clean">
+   <sequential>
+     <subant target="prepare-release-no-sign" inheritall="false" failonerror="true">
+       <fileset dir="lucene" includes="build.xml" />
+       <fileset dir="solr" includes="build.xml" />
+       <property name="version" value="${fakeReleaseVersion}" />
+     </subant>
+     <delete dir="${fakeRelease}"/>
+     <delete dir="${fakeReleaseTmp}"/>
+     <mkdir dir="${fakeRelease}"/>
+     <copy todir="${fakeRelease}/lucene">
+       <fileset dir="lucene/dist"/>
+     </copy>
+     <copy todir="${fakeRelease}/lucene/changes">
+       <fileset dir="lucene/build/docs/changes"/>
+     </copy>
+     <get src="http://people.apache.org/keys/group/lucene.asc" 
+          dest="${fakeRelease}/lucene/KEYS"/>
+     <copy todir="${fakeRelease}/solr">
+       <fileset dir="solr/package"/>
+     </copy>
+     <copy file="${fakeRelease}/lucene/KEYS" todir="${fakeRelease}/solr"/>
+     <makeurl file="${fakeRelease}" validate="false" property="fakeRelease.uri"/>
+     <exec executable="${python32.exe}" failonerror="true">
+       <arg value="-u"/>
+       <arg value="dev-tools/scripts/smokeTestRelease.py"/>
+       <arg value="${fakeRelease.uri}"/>
+       <arg value="${fakeReleaseVersion}"/>
+       <arg value="${fakeReleaseTmp}"/>
+       <arg value="false"/>
+       <env key="JAVA6_HOME" value="${JAVA6_HOME}"/>
+       <env key="JAVA7_HOME" value="${JAVA7_HOME}"/>
+     </exec>
+     <delete dir="${fakeRelease}"/>
+     <delete dir="${fakeReleaseTmp}"/>
+   </sequential>
+  </target>
 </project>

Modified: lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py?rev=1370518&r1=1370517&r2=1370518&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py Tue Aug  7 20:58:46 2012
@@ -363,6 +363,10 @@ def verifyDigests(artifact, urlString, t
     raise RuntimeError('SHA1 digest mismatch for %s: expected %s but got %s' % (artifact, sha1Expected, sha1Actual))
 
 def getDirEntries(urlString):
+  if urlString.startswith('file:/') and not urlString.startswith('file://'):
+    # stupid bogus ant URI
+    urlString = "file:///" + urlString[6:]
+
   if urlString.startswith('file://'):
     path = urlString[7:]
     if path.endswith('/'):
@@ -1026,7 +1030,7 @@ def crawl(downloadedFiles, urlString, ta
 
 def main():
 
-  if len(sys.argv) != 4:
+  if len(sys.argv) < 4:
     print()
     print('Usage python -u %s BaseURL version tmpDir' % sys.argv[0])
     print()
@@ -1035,8 +1039,11 @@ def main():
   baseURL = sys.argv[1]
   version = sys.argv[2]
   tmpDir = os.path.abspath(sys.argv[3])
+  isSigned = True 
+  if len(sys.argv) == 5:
+    isSigned = (sys.argv[4] == "True")
 
-  smokeTest(baseURL, version, tmpDir, True)
+  smokeTest(baseURL, version, tmpDir, isSigned)
 
 def smokeTest(baseURL, version, tmpDir, isSigned):
 
@@ -1090,4 +1097,5 @@ if __name__ == '__main__':
   except:
     import traceback
     traceback.print_exc()
-  
+    sys.exit(1)
+  sys.exit(0)