You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2018/02/26 23:47:30 UTC

[1/4] lucene-solr:master: LUCENE-8106: fix module regex to recognize Windows path backslashes

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x ad9182a0c -> 67d17644f
  refs/heads/master 50c17b92b -> 41af8bd16


LUCENE-8106: fix module regex to recognize Windows path backslashes


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/606e91c2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/606e91c2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/606e91c2

Branch: refs/heads/master
Commit: 606e91c2aeb2cb8678fcd40918e04cd3aef3022c
Parents: 50c17b9
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Feb 26 18:43:52 2018 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Feb 26 18:43:52 2018 -0500

----------------------------------------------------------------------
 dev-tools/scripts/reproduceJenkinsFailures.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/606e91c2/dev-tools/scripts/reproduceJenkinsFailures.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/reproduceJenkinsFailures.py b/dev-tools/scripts/reproduceJenkinsFailures.py
index 5e081cb..f6da613 100644
--- a/dev-tools/scripts/reproduceJenkinsFailures.py
+++ b/dev-tools/scripts/reproduceJenkinsFailures.py
@@ -46,7 +46,7 @@ reTestsSeed = re.compile(r'-Dtests.seed=\S+\s*')
 reJenkinsURLWithoutConsoleText = re.compile(r'https?://.*/\d+/?\Z', re.IGNORECASE)
 
 reJavaFile = re.compile(r'(.*)\.java\Z')
-reModule = re.compile(r'\./(.*)/src/')
+reModule = re.compile(r'\.[\\/](.*)[\\/]src[\\/]')
 reTestOutputFile = re.compile(r'TEST-(.*\.([^-.]+))(?:-\d+)?\.xml\Z')
 reErrorFailure = re.compile(r'(?:errors|failures)="[^0]')
 reGitMainBranch = re.compile(r'^(?:master|branch_[x_\d]+)$')


[3/4] lucene-solr:branch_7x: LUCENE-8106: stop parsing ANT_OPTS from Jenkins log

Posted by sa...@apache.org.
LUCENE-8106: stop parsing ANT_OPTS from Jenkins log


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/67d17644
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/67d17644
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/67d17644

Branch: refs/heads/branch_7x
Commit: 67d17644ff85bc4e9dde8d2659e7eac2db3d862d
Parents: 443cc19
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Feb 26 18:47:05 2018 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Feb 26 18:47:05 2018 -0500

----------------------------------------------------------------------
 dev-tools/scripts/reproduceJenkinsFailures.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/67d17644/dev-tools/scripts/reproduceJenkinsFailures.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/reproduceJenkinsFailures.py b/dev-tools/scripts/reproduceJenkinsFailures.py
index f6da613..64a2732 100644
--- a/dev-tools/scripts/reproduceJenkinsFailures.py
+++ b/dev-tools/scripts/reproduceJenkinsFailures.py
@@ -34,9 +34,6 @@ reGitRev = re.compile(r'Checking out Revision (\S+)\s+\(refs/remotes/origin/([^)
 reAntInvocation = re.compile(r'\bant(?:\.bat)?\s+.*(?:jenkins-(?:hourly|nightly)|nightly-smoke)')
 reAntSysprops = re.compile(r'"-D[^"]+"|-D[^=]+="[^"]*"|-D\S+')
 
-#            sarowe Jenkins example: + export 'ANT_OPTS=-Xmx1150m -XX:+CMSClassUnloadingEnabled -Djava.awt.headless=true -Dargs="-Xmx1g"'
-reAntOptions = re.compile(r"export\s+'?\s*ANT_OPTS=([^'\n\r]+)")
-
 # Method example: NOTE: reproduce with: ant test  -Dtestcase=ZkSolrClientTest -Dtests.method=testMultipleWatchesAsync -Dtests.seed=6EF5AB70F0032849 -Dtests.slow=true -Dtests.locale=he-IL -Dtests.timezone=NST -Dtests.asserts=true -Dtests.file.encoding=UTF-8
 # Suite example:  NOTE: reproduce with: ant test  -Dtestcase=CloudSolrClientTest -Dtests.seed=DB2DF2D8228BAF27 -Dtests.multiplier=3 -Dtests.slow=true -Dtests.locale=es-AR -Dtests.timezone=America/Argentina/Cordoba -Dtests.asserts=true -Dtests.file.encoding=US-ASCII
 reReproLine = re.compile(r'NOTE:\s+reproduce\s+with:(\s+ant\s+test\s+-Dtestcase=(\S+)\s+(?:-Dtests.method=\S+\s+)?(.*))')
@@ -126,12 +123,8 @@ def fetchAndParseJenkinsLog(url):
             match = reAntInvocation.search(line)
             if match is not None:
               antOptions = ' '.join(reAntSysprops.findall(line))
-            else:
-              match = reAntOptions.search(line)
-              if match is not None:
-                antOptions = ' '.join(reAntSysprops.findall(line))
-    if len(antOptions) > 0:
-      print('[repro] Ant options: %s' % antOptions)
+              if len(antOptions) > 0:
+                print('[repro] Ant options: %s' % antOptions)
   except urllib.error.URLError as e:
     raise RuntimeError('ERROR: fetching %s : %s' % (url, e))
   


[2/4] lucene-solr:branch_7x: LUCENE-8106: fix module regex to recognize Windows path backslashes

Posted by sa...@apache.org.
LUCENE-8106: fix module regex to recognize Windows path backslashes


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/443cc19d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/443cc19d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/443cc19d

Branch: refs/heads/branch_7x
Commit: 443cc19db2afa28ab258a577d4bbd6e9e0b24b57
Parents: ad9182a
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Feb 26 18:43:52 2018 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Feb 26 18:44:24 2018 -0500

----------------------------------------------------------------------
 dev-tools/scripts/reproduceJenkinsFailures.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/443cc19d/dev-tools/scripts/reproduceJenkinsFailures.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/reproduceJenkinsFailures.py b/dev-tools/scripts/reproduceJenkinsFailures.py
index 5e081cb..f6da613 100644
--- a/dev-tools/scripts/reproduceJenkinsFailures.py
+++ b/dev-tools/scripts/reproduceJenkinsFailures.py
@@ -46,7 +46,7 @@ reTestsSeed = re.compile(r'-Dtests.seed=\S+\s*')
 reJenkinsURLWithoutConsoleText = re.compile(r'https?://.*/\d+/?\Z', re.IGNORECASE)
 
 reJavaFile = re.compile(r'(.*)\.java\Z')
-reModule = re.compile(r'\./(.*)/src/')
+reModule = re.compile(r'\.[\\/](.*)[\\/]src[\\/]')
 reTestOutputFile = re.compile(r'TEST-(.*\.([^-.]+))(?:-\d+)?\.xml\Z')
 reErrorFailure = re.compile(r'(?:errors|failures)="[^0]')
 reGitMainBranch = re.compile(r'^(?:master|branch_[x_\d]+)$')


[4/4] lucene-solr:master: LUCENE-8106: stop parsing ANT_OPTS from Jenkins log

Posted by sa...@apache.org.
LUCENE-8106: stop parsing ANT_OPTS from Jenkins log


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/41af8bd1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/41af8bd1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/41af8bd1

Branch: refs/heads/master
Commit: 41af8bd16a4d5151adebe3e4dfe847854ab5bde3
Parents: 606e91c
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Feb 26 18:47:05 2018 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Feb 26 18:47:18 2018 -0500

----------------------------------------------------------------------
 dev-tools/scripts/reproduceJenkinsFailures.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/41af8bd1/dev-tools/scripts/reproduceJenkinsFailures.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/reproduceJenkinsFailures.py b/dev-tools/scripts/reproduceJenkinsFailures.py
index f6da613..64a2732 100644
--- a/dev-tools/scripts/reproduceJenkinsFailures.py
+++ b/dev-tools/scripts/reproduceJenkinsFailures.py
@@ -34,9 +34,6 @@ reGitRev = re.compile(r'Checking out Revision (\S+)\s+\(refs/remotes/origin/([^)
 reAntInvocation = re.compile(r'\bant(?:\.bat)?\s+.*(?:jenkins-(?:hourly|nightly)|nightly-smoke)')
 reAntSysprops = re.compile(r'"-D[^"]+"|-D[^=]+="[^"]*"|-D\S+')
 
-#            sarowe Jenkins example: + export 'ANT_OPTS=-Xmx1150m -XX:+CMSClassUnloadingEnabled -Djava.awt.headless=true -Dargs="-Xmx1g"'
-reAntOptions = re.compile(r"export\s+'?\s*ANT_OPTS=([^'\n\r]+)")
-
 # Method example: NOTE: reproduce with: ant test  -Dtestcase=ZkSolrClientTest -Dtests.method=testMultipleWatchesAsync -Dtests.seed=6EF5AB70F0032849 -Dtests.slow=true -Dtests.locale=he-IL -Dtests.timezone=NST -Dtests.asserts=true -Dtests.file.encoding=UTF-8
 # Suite example:  NOTE: reproduce with: ant test  -Dtestcase=CloudSolrClientTest -Dtests.seed=DB2DF2D8228BAF27 -Dtests.multiplier=3 -Dtests.slow=true -Dtests.locale=es-AR -Dtests.timezone=America/Argentina/Cordoba -Dtests.asserts=true -Dtests.file.encoding=US-ASCII
 reReproLine = re.compile(r'NOTE:\s+reproduce\s+with:(\s+ant\s+test\s+-Dtestcase=(\S+)\s+(?:-Dtests.method=\S+\s+)?(.*))')
@@ -126,12 +123,8 @@ def fetchAndParseJenkinsLog(url):
             match = reAntInvocation.search(line)
             if match is not None:
               antOptions = ' '.join(reAntSysprops.findall(line))
-            else:
-              match = reAntOptions.search(line)
-              if match is not None:
-                antOptions = ' '.join(reAntSysprops.findall(line))
-    if len(antOptions) > 0:
-      print('[repro] Ant options: %s' % antOptions)
+              if len(antOptions) > 0:
+                print('[repro] Ant options: %s' % antOptions)
   except urllib.error.URLError as e:
     raise RuntimeError('ERROR: fetching %s : %s' % (url, e))