This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/flink-connector-elasticsearch.git
The following commit(s) were added to refs/heads/main by this push:
new 85f0f40 [FLINK-31696] ElasticSearch nightly CI failure
85f0f40 is described below
commit 85f0f4057a6b241a7d9b0ae2996ac1147e0e2428
Author: Andriy Redko <andriy.re...@aiven.io>
AuthorDate: Tue Apr 11 12:36:09 2023 -0400
[FLINK-31696] ElasticSearch nightly CI failure
Signed-off-by: Andriy Redko <andriy.re...@aiven.io>
---
.github/workflows/push_pr.yml | 5 ++++-
.github/workflows/weekly.yml | 2 +-
.../org/apache/flink/connector/elasticsearch/ElasticsearchUtil.java | 6 ++++++
.../elasticsearch/table/Elasticsearch6DynamicSinkITCase.java | 5 +++++
.../elasticsearch/table/Elasticsearch6DynamicSinkTest.java | 5 +++++
.../elasticsearch/table/Elasticsearch7DynamicSinkITCase.java | 5 +++++
.../elasticsearch/table/Elasticsearch7DynamicSinkTest.java | 5 +++++
7 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 335f108..b30b09f 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -23,6 +23,9 @@ concurrency:
cancel-in-progress: true
jobs:
compile_and_test:
+ strategy:
+ matrix:
+ flink: [1.17.0, 1.18-SNAPSHOT]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
- flink_version: 1.17.0
+ flink_version: ${{ matrix.flink }}
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index f4645db..b4daceb 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -26,7 +26,7 @@ jobs:
if: github.repository_owner == 'apache'
strategy:
matrix:
- flink: [1.16-SNAPSHOT, 1.17-SNAPSHOT, 1.18-SNAPSHOT]
+ flink: [1.17-SNAPSHOT, 1.18-SNAPSHOT]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
flink_version: ${{ matrix.flink }}
diff --git
a/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/ElasticsearchUtil.java
b/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/ElasticsearchUtil.java
index 7b856c2..f7126b7 100644
---
a/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/ElasticsearchUtil.java
+++
b/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/ElasticsearchUtil.java
@@ -29,6 +29,8 @@ import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
import org.testcontainers.utility.DockerImageName;
+import java.util.Optional;
+
/** Collection of utility methods for Elasticsearch tests. */
@Internal
public class ElasticsearchUtil {
@@ -88,5 +90,9 @@ public class ElasticsearchUtil {
DataType consumedDataType) {
return null;
}
+
+ public Optional<int[][]> getTargetColumns() {
+ return Optional.empty();
+ }
}
}
diff --git
a/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
b/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
index 32baf0a..f1c8f7e 100644
---
a/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
+++
b/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
@@ -61,6 +61,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Optional;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.TestContext.context;
import static org.apache.flink.table.api.Expressions.row;
@@ -402,5 +403,9 @@ public class Elasticsearch6DynamicSinkITCase extends
TestLogger {
DataType consumedDataType) {
return null;
}
+
+ public Optional<int[][]> getTargetColumns() {
+ return Optional.empty();
+ }
}
}
diff --git
a/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkTest.java
b/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkTest.java
index f8ab0ab..e00f6b3 100644
---
a/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkTest.java
+++
b/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkTest.java
@@ -43,6 +43,7 @@ import org.mockito.Mockito;
import java.time.ZoneId;
import java.util.List;
+import java.util.Optional;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.never;
@@ -271,6 +272,10 @@ public class Elasticsearch6DynamicSinkTest extends
TestLogger {
DataType consumedDataType) {
return null;
}
+
+ public Optional<int[][]> getTargetColumns() {
+ return Optional.empty();
+ }
}
/** Custom failure handler for testing. */
diff --git
a/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkITCase.java
b/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkITCase.java
index 63d06e5..7489b98 100644
---
a/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkITCase.java
+++
b/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkITCase.java
@@ -61,6 +61,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Optional;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.TestContext.context;
import static org.apache.flink.table.api.Expressions.row;
@@ -372,5 +373,9 @@ public class Elasticsearch7DynamicSinkITCase extends
TestLogger {
DataType consumedDataType) {
return null;
}
+
+ public Optional<int[][]> getTargetColumns() {
+ return Optional.empty();
+ }
}
}
diff --git
a/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkTest.java
b/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkTest.java
index 2928c8d..8bd3921 100644
---
a/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkTest.java
+++
b/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkTest.java
@@ -43,6 +43,7 @@ import org.mockito.Mockito;
import java.time.ZoneId;
import java.util.List;
+import java.util.Optional;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.never;
@@ -271,6 +272,10 @@ public class Elasticsearch7DynamicSinkTest extends
TestLogger {
DataType consumedDataType) {
return null;
}
+
+ public Optional<int[][]> getTargetColumns() {
+ return Optional.empty();
+ }
}
/** Custom failure handler for testing. */
