You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mt...@apache.org on 2022/03/06 00:05:55 UTC
[nifi] branch main updated: NIFI-9766 avoid intermittent SearchElasticsearchTest failures in CI pipeline
This is an automated email from the ASF dual-hosted git repository.
mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 12685a4 NIFI-9766 avoid intermittent SearchElasticsearchTest failures in CI pipeline
12685a4 is described below
commit 12685a4af442eb343808d9017f29b5087520a146
Author: Chris Sampson <ch...@gmail.com>
AuthorDate: Sat Mar 5 18:35:28 2022 +0000
NIFI-9766 avoid intermittent SearchElasticsearchTest failures in CI pipeline
This closes #5842
Signed-off-by: Mike Thomsen <mt...@apache.org>
---
.../nifi-elasticsearch-client-service/pom.xml | 6 ++----
.../nifi/processors/elasticsearch/SearchElasticsearchTest.groovy | 4 ++++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
index 050e2ad..91a277a 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
@@ -228,7 +228,6 @@
</activation>
<properties>
<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.script.name>setup-6.script</es.int.script.name>
<es.int.path.conf />
@@ -242,7 +241,6 @@
</activation>
<properties>
<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.type.name />
<es.int.path.conf />
@@ -256,7 +254,6 @@
</activation>
<properties>
<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.type.name />
<es.int.path.conf />
@@ -270,7 +267,8 @@
</activation>
<properties>
<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.type.name />
<es.int.path.conf />
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy
index 5fc0647..ea60ce8 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy
@@ -107,6 +107,10 @@ class SearchElasticsearchTest extends AbstractPaginatedJsonQueryElasticsearchTes
while (expiration.isAfter(Instant.now())) {
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()
runner.clearTransferState()