Here's my idea... and 'ant nightly-smoke' passes 'skip' for this argument. rmuir@beast:~/workspace/lucene-trunk3/dev-tools/scripts$ svn diff Index: smokeTestRelease.py =================================================================== --- smokeTestRelease.py (revision 1479917) +++ smokeTestRelease.py (working copy) @@ -198,8 +198,6 @@ 'Ant-Version: Apache Ant 1.8', # Make sure .class files are 1.7 format: 'X-Compile-Target-JDK: 1.7', - # Make sure this matches the version and svn revision we think we are releasing: - 'Implementation-Version: %s %s ' % (version, svnRevision), 'Specification-Version: %s' % version, # Make sure the release was compiled with 1.7: 'Created-By: 1.7'): @@ -207,6 +205,13 @@ raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF' % \ (desc, verify))
+ if svnRevision != 'skip': + # Make sure this matches the version and svn revision we think we are releasing: + verifyRevision = 'Implementation-Version: %s %s ' % (version, svnRevision) + if s.find(verifyRevision) == -1: + raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF (wrong svn revision?)' % \ + (desc, verifyRevision)) + notice = decodeUTF8(z.read(NOTICE_FILE_NAME)) license = decodeUTF8(z.read(LICENSE_FILE_NAME)) On Tue, May 7, 2013 at 11:35 AM, Robert Muir <rcm...@gmail.com> wrote: > This prevents the possibility of using 'ant nightly-smoke' to test changes > to the build system before committing. > > Thats because your checkout will always have a 'modified' revision and > cause it to fail vs the checkout: > > For example below: 5.0.0 1479917M vs 5.0.0 1479917 - rmuir - 2013-05-07 > 11:19:46 > > Can we disable this for now? Or at least make it only an option that > nightly-smoke explicitly turns off? > If no one replies, I will disable it. > > [exec] File > "/home/rmuir/workspace/lucene-trunk3/dev-tools/scripts/smokeTestRelease.py", > line 1378, in <module> > [exec] main() > [exec] File > "/home/rmuir/workspace/lucene-trunk3/dev-tools/scripts/smokeTestRelease.py", > line 1322, in main > [exec] smokeTest(baseURL, svnRevision, version, tmpDir, isSigned) > [exec] File > "/home/rmuir/workspace/lucene-trunk3/dev-tools/scripts/smokeTestRelease.py", > line 1359, in smokeTest > [exec] unpackAndVerify('lucene', tmpDir, artifact, svnRevision, > version) > [exec] File > "/home/rmuir/workspace/lucene-trunk3/dev-tools/scripts/smokeTestRelease.py", > line 590, in unpackAndVerify > [exec] verifyUnpacked(project, artifact, unpackPath, svnRevision, > version, tmpDir) > [exec] File > "/home/rmuir/workspace/lucene-trunk3/dev-tools/scripts/smokeTestRelease.py", > line 715, in verifyUnpacked > [exec] checkAllJARs(os.getcwd(), project, svnRevision, version) > [exec] File > "/home/rmuir/workspace/lucene-trunk3/dev-tools/scripts/smokeTestRelease.py", > line 266, in checkAllJARs > [exec] checkJARMetaData('JAR file "%s"' % fullPath, fullPath, > svnRevision, version) > [exec] File > "/home/rmuir/workspace/lucene-trunk3/dev-tools/scripts/smokeTestRelease.py", > line 208, in c verify JAR/WAR metadata... > [exec] heckJARMetaData > [exec] (desc, verify)) > [exec] RuntimeError: JAR file > "/home/rmuir/workspace/lucene-trunk3/lucene/build/fakeReleaseTmp/unpack/lucene-5.0.0/queryparser/lucene-queryparser-5.0.0.jar" > is missing "Implementation-Version: 5.0.0 1479917M " inside its > META-INF/MANIFEST.MF > >