cpoerschke commented on a change in pull request #355:
URL: https://github.com/apache/lucene/pull/355#discussion_r723514273
##########
File path: dev-tools/scripts/smokeTestRelease.py
##########
@@ -658,97 +616,41 @@ def verifyUnpacked(java, project, artifact, unpackPath,
gitRevision, version, te
print(' run "%s"' % validateCmd)
java.run_java11(validateCmd, '%s/validate.log' % unpackPath)
- if project == 'lucene':
- print(" run tests w/ Java 11 and testArgs='%s'..." % testArgs)
- java.run_java11('ant clean test %s' % testArgs, '%s/test.log' %
unpackPath)
- java.run_java11('ant jar', '%s/compile.log' % unpackPath)
- testDemo(java.run_java11, isSrc, version, '11')
-
- print(' generate javadocs w/ Java 11...')
- java.run_java11('ant javadocs', '%s/javadocs.log' % unpackPath)
- checkBrokenLinks('%s/build/docs' % unpackPath)
-
- if java.run_java12:
- print(" run tests w/ Java 12 and testArgs='%s'..." % testArgs)
- java.run_java12('ant clean test %s' % testArgs, '%s/test.log' %
unpackPath)
- java.run_java12('ant jar', '%s/compile.log' % unpackPath)
- testDemo(java.run_java12, isSrc, version, '12')
-
- #print(' generate javadocs w/ Java 12...')
- #java.run_java12('ant javadocs', '%s/javadocs.log' % unpackPath)
- #checkBrokenLinks('%s/build/docs' % unpackPath)
-
- else:
- os.chdir('solr')
-
- print(" run tests w/ Java 11 and testArgs='%s'..." % testArgs)
- java.run_java11('ant clean test -Dtests.slow=false %s' % testArgs,
'%s/test.log' % unpackPath)
-
- # test javadocs
- print(' generate javadocs w/ Java 11...')
- java.run_java11('ant clean javadocs', '%s/javadocs.log' % unpackPath)
- checkBrokenLinks('%s/solr/build/docs')
-
- print(' test solr example w/ Java 11...')
- java.run_java11('ant clean server', '%s/antexample.log' % unpackPath)
- testSolrExample(unpackPath, java.java11_home, True)
+ print(" run tests w/ Java 11 and testArgs='%s'..." % testArgs)
+ java.run_java11('ant clean test %s' % testArgs, '%s/test.log' % unpackPath)
+ java.run_java11('ant jar', '%s/compile.log' % unpackPath)
+ testDemo(java.run_java11, isSrc, version, '11')
- if java.run_java12:
- print(" run tests w/ Java 12 and testArgs='%s'..." % testArgs)
- java.run_java12('ant clean test -Dtests.slow=false %s' % testArgs,
'%s/test.log' % unpackPath)
+ print(' generate javadocs w/ Java 11...')
+ java.run_java11('ant javadocs', '%s/javadocs.log' % unpackPath)
+ checkBrokenLinks('%s/build/docs' % unpackPath)
- #print(' generate javadocs w/ Java 12...')
- #java.run_java12('ant clean javadocs', '%s/javadocs.log' % unpackPath)
- #checkBrokenLinks('%s/solr/build/docs' % unpackPath)
+ if java.run_java12:
+ print(" run tests w/ Java 12 and testArgs='%s'..." % testArgs)
+ java.run_java12('ant clean test %s' % testArgs, '%s/test.log' %
unpackPath)
+ java.run_java12('ant jar', '%s/compile.log' % unpackPath)
+ testDemo(java.run_java12, isSrc, version, '12')
- print(' test solr example w/ Java 12...')
- java.run_java12('ant clean server', '%s/antexample.log' % unpackPath)
- testSolrExample(unpackPath, java.java12_home, True)
-
- os.chdir('..')
- print(' check NOTICE')
- testNotice(unpackPath)
+ #print(' generate javadocs w/ Java 12...')
+ #java.run_java12('ant javadocs', '%s/javadocs.log' % unpackPath)
+ #checkBrokenLinks('%s/build/docs' % unpackPath)
else:
checkAllJARs(os.getcwd(), project, gitRevision, version, tmpDir, baseURL)
- if project == 'lucene':
- testDemo(java.run_java11, isSrc, version, '11')
- if java.run_java12:
- testDemo(java.run_java12, isSrc, version, '12')
-
- else:
- print(' copying unpacked distribution for Java 11 ...')
- java11UnpackPath = '%s-java11' % unpackPath
- if os.path.exists(java11UnpackPath):
- shutil.rmtree(java11UnpackPath)
- shutil.copytree(unpackPath, java11UnpackPath)
- os.chdir(java11UnpackPath)
- print(' test solr example w/ Java 11...')
- testSolrExample(java11UnpackPath, java.java11_home, False)
-
- if java.run_java12:
- print(' copying unpacked distribution for Java 12 ...')
- java12UnpackPath = '%s-java12' % unpackPath
- if os.path.exists(java12UnpackPath):
- shutil.rmtree(java12UnpackPath)
- shutil.copytree(unpackPath, java12UnpackPath)
- os.chdir(java12UnpackPath)
- print(' test solr example w/ Java 12...')
- testSolrExample(java12UnpackPath, java.java12_home, False)
-
- os.chdir(unpackPath)
+ testDemo(java.run_java11, isSrc, version, '11')
+ if java.run_java12:
+ testDemo(java.run_java12, isSrc, version, '12')
testChangesText('.', version, project)
- if project == 'lucene' and isSrc:
+ if isSrc:
print(' confirm all releases have coverage in TestBackwardsCompatibility')
confirmAllReleasesAreTestedForBackCompat(version, unpackPath)
def testNotice(unpackPath):
- solrNotice = open('%s/NOTICE.txt' % unpackPath, encoding='UTF-8').read()
luceneNotice = open('%s/lucene/NOTICE.txt' % unpackPath,
encoding='UTF-8').read()
expected = """
Review comment:
Looks like this is no longer used now then, but the `testNotice`
function itself still confirms that the `lucene/NOTICE.txt` is readable i.e.
the local variable here could be removed (or put to use) but the function
itself can stay (assuming no other tests do equivalent checks).
##########
File path: dev-tools/scripts/smokeTestRelease.py
##########
@@ -900,42 +701,19 @@ def testDemo(run_java, isSrc, version, jdk):
if removeTrailingZeros(actualVersion) != removeTrailingZeros(version):
raise RuntimeError('wrong version from CheckIndex: got "%s" but expected
"%s"' % (actualVersion, version))
+
def removeTrailingZeros(version):
return re.sub(r'(\.0)*$', '', version)
-def checkMaven(solrSrcUnpackPath, baseURL, tmpDir, gitRevision, version,
isSigned, keysFile):
Review comment:
Maybe also somehow mention this in the PR description since it's also
removing some 'lucene' logic.
##########
File path: dev-tools/scripts/smokeTestRelease.py
##########
@@ -48,6 +48,7 @@
cygwin = platform.system().lower().startswith('cygwin')
cygwinWindowsRoot = os.popen('cygpath -w /').read().strip().replace('\\','/')
if cygwin else ''
+
Review comment:
Line 44 above has an `and /solr` that can be removed.
##########
File path: dev-tools/scripts/smokeTestRelease.py
##########
@@ -1376,7 +1144,7 @@ def main():
c = parse_config()
scriptVersion = scriptutil.find_current_version()
- if not c.version.startswith(scriptVersion + '.'):
+ if not c.version.startswith(scriptVersion + '.') and c.version !=
scriptVersion:
Review comment:
Could this be just this?
```suggestion
if c.version != scriptVersion:
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
