chore(ci): add InfluxDB 2.1 to pipeline (#784)

Author: bednar

.github/workflows/master.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         jdk: [3-openjdk-17-slim, 3-jdk-14, 3-jdk-8-slim]
-        influxdb: ['1.1', '1.6', '1.8', '2.0']
+        influxdb: ['1.1', '1.6', '1.8', '2.0', '2.1']
 
     steps:
       - name: Checkout
@@ -26,6 +26,7 @@ jobs:
 
       - name: codecov
         run: bash <(curl -s https://codecov.io/bash)
+        if: matrix.influxdb != '2.0' && matrix.influxdb != '2.1'
 
 
   # deploy:

.github/workflows/pr.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         jdk: [3-openjdk-17-slim, 3-jdk-14, 3-jdk-8-slim]
-        influxdb: ['1.1', '1.6', '1.8', '2.0']
+        influxdb: ['1.1', '1.6', '1.8', '2.0', '2.1']
 
     steps:
       - name: Checkout
@@ -30,4 +30,4 @@ jobs:
 
       - name: codecov
         run: bash <(curl -s https://codecov.io/bash)
-        if: matrix.influxdb != '2.0'
+        if: matrix.influxdb != '2.0' && matrix.influxdb != '2.1'

compile-and-test.sh

@@ -44,7 +44,7 @@ docker run \
 echo "Running tests"
 PROXY_API_URL=http://nginx:8080/influx-api/
 PROXY_UDP_PORT=8080
-if [[ "$INFLUXDB_VERSION" == "2.0" ]]
+if [[ "$INFLUXDB_VERSION" == "2."* ]]
 then
     TEST_EXPRESSION="InfluxDB2Test"
     # Wait to start InfluxDB

src/test/java/org/influxdb/BatchOptionsTest.java

@@ -466,8 +466,7 @@ public void testHandlerOnRetryImpossible() throws InterruptedException {
 
       writeSomePoints(influxDB, 1);
 
-      Thread.sleep(200);
-      verify(mockHandler, times(1)).accept(any(), any());
+      verify(mockHandler, timeout(500).times(1)).accept(any(), any());
 
       QueryResult result = influxDB.query(new Query("select * from weather", dbName));
       Assertions.assertNull(result.getResults().get(0).getSeries());

src/test/java/org/influxdb/InfluxDB2Test.java

@@ -18,7 +18,7 @@
  * @author Jakub Bednar (30/08/2021 11:31)
  */
 @RunWith(JUnitPlatform.class)
-@EnabledIfEnvironmentVariable(named = "INFLUXDB_VERSION", matches = "2\\.0")
+@EnabledIfEnvironmentVariable(named = "INFLUXDB_VERSION", matches = "2\\..")
 public class InfluxDB2Test {
 
     private InfluxDB influxDB;