janhoy commented on a change in pull request #355: URL: https://github.com/apache/lucene/pull/355#discussion_r726029721
########## 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): - POMtemplates = defaultdict() - getPOMtemplates(solrSrcUnpackPath, POMtemplates, tmpDir) - print(' download artifacts') - artifacts = {'lucene': [], 'solr': []} - for project in ('lucene', 'solr'): - artifactsURL = '%s/%s/maven/org/apache/%s/' % (baseURL, project, project) - targetDir = '%s/maven/org/apache/%s' % (tmpDir, project) - if not os.path.exists(targetDir): - os.makedirs(targetDir) - crawl(artifacts[project], artifactsURL, targetDir) - print() - verifyPOMperBinaryArtifact(artifacts, version) - verifyArtifactPerPOMtemplate(POMtemplates, artifacts, tmpDir, version) - verifyMavenDigests(artifacts) - checkJavadocAndSourceArtifacts(artifacts, version) - verifyDeployedPOMsCoordinates(artifacts, version) - if isSigned: - verifyMavenSigs(baseURL, tmpDir, artifacts, keysFile) - - distFiles = getBinaryDistFilesForMavenChecks(tmpDir, version, baseURL) - checkIdenticalMavenArtifacts(distFiles, artifacts, version) - - checkAllJARs('%s/maven/org/apache/lucene' % tmpDir, 'lucene', gitRevision, version, tmpDir, baseURL) - checkAllJARs('%s/maven/org/apache/solr' % tmpDir, 'solr', gitRevision, version, tmpDir, baseURL) def getBinaryDistFilesForMavenChecks(tmpDir, version, baseURL): # TODO: refactor distribution unpacking so that it only happens once per distribution per smoker run distFiles = defaultdict() - for project in ('lucene', 'solr'): + for project in ('lucene'): Review comment: Please review the latest commit 0748a7d6092af26c1be0556bef4c749ad040f813 where I have removed the unnecessary for loops with only 'lucene', and also removed 'project' from several functions. I think it justifies a separate review. -- 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