Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-07 10:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-9766 avoid intermittent SearchElasticsearchTest failures in CI pipeline

Browse Source 
This closes #5842

Signed-off-by: Mike Thomsen <mthomsen@apache.org>
This commit is contained in:
Chris Sampson 2022-03-05 18:35:28 +00:00 committed by Mike Thomsen
parent 65dd62716a
commit 12685a4af4
No known key found for this signature in database
GPG Key ID: 88511C3D4CAD246F
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
View File

@ -228,7 +228,6 @@
</activation> </activation>
<properties> <properties>
<es.int.version>6.8.23</es.int.version> <es.int.version>6.8.23</es.int.version>
<alexcojocaru.plugin.version>6.19</alexcojocaru.plugin.version>
<es.int.type.name>_doc</es.int.type.name> <es.int.type.name>_doc</es.int.type.name>
<es.int.script.name>setup-6.script</es.int.script.name> <es.int.script.name>setup-6.script</es.int.script.name>
<es.int.path.conf /> <es.int.path.conf />
@ -242,7 +241,6 @@
</activation> </activation>
<properties> <properties>
<es.int.version>7.10.2</es.int.version> <es.int.version>7.10.2</es.int.version>
<alexcojocaru.plugin.version>6.19</alexcojocaru.plugin.version>
<es.int.script.name>setup-7.script</es.int.script.name> <es.int.script.name>setup-7.script</es.int.script.name>
<es.int.type.name /> <es.int.type.name />
<es.int.path.conf /> <es.int.path.conf />
@ -256,7 +254,6 @@
</activation> </activation>
<properties> <properties>
<es.int.version>7.17.1</es.int.version> <es.int.version>7.17.1</es.int.version>
<alexcojocaru.plugin.version>6.19</alexcojocaru.plugin.version>
<es.int.script.name>setup-7.script</es.int.script.name> <es.int.script.name>setup-7.script</es.int.script.name>
<es.int.type.name /> <es.int.type.name />
<es.int.path.conf /> <es.int.path.conf />
@ -270,7 +267,8 @@
</activation> </activation>
<properties> <properties>
<es.int.version>8.0.1</es.int.version> <es.int.version>8.0.1</es.int.version>
<alexcojocaru.plugin.version>6.20</alexcojocaru.plugin.version> <!-- elasticsearch-maven-plugin version 6.20+ required for Elasticsearch 8.x+ -->
<alexcojocaru.plugin.version>6.22</alexcojocaru.plugin.version>
<es.int.script.name>setup-8.script</es.int.script.name> <es.int.script.name>setup-8.script</es.int.script.name>
<es.int.type.name /> <es.int.type.name />
<es.int.path.conf /> <es.int.path.conf />

4
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy
View File

@ -107,6 +107,10 @@ class SearchElasticsearchTest extends AbstractPaginatedJsonQueryElasticsearchTes
while (expiration.isAfter(Instant.now())) { while (expiration.isAfter(Instant.now())) {
Thread.sleep(10) Thread.sleep(10)
} }
if ("true".equalsIgnoreCase(System.getenv("CI"))) {
// allow extra time if running in CI Pipeline to prevent intermittent timing-issue failures
Thread.sleep(1000)
}
service.resetPageCount() service.resetPageCount()
runner.clearTransferState() runner.clearTransferState()