[release] Upgrade current version to 1.15 for AbstractOperatorRestore…

…TestBase and create snapshots
lovepoem · May 8, 2022 · 609be42 · 609be42
1 parent a295871
commit 609be42
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 28 deletions.
diff --git a/.../apache/flink/test/state/operator/restore/keyed/AbstractKeyedOperatorRestoreTestBase.java b/.../apache/flink/test/state/operator/restore/keyed/AbstractKeyedOperatorRestoreTestBase.java
@@ -28,7 +28,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.Arrays;
 import java.util.Collection;
 
 /** Base class for all keyed operator restore tests. */
@@ -39,19 +38,7 @@ public abstract class AbstractKeyedOperatorRestoreTestBase extends AbstractOpera
 
     @Parameterized.Parameters(name = "Migrate Savepoint: {0}")
     public static Collection<FlinkVersion> parameters() {
-        return Arrays.asList(
-                FlinkVersion.v1_3,
-                FlinkVersion.v1_4,
-                FlinkVersion.v1_5,
-                FlinkVersion.v1_6,
-                FlinkVersion.v1_7,
-                FlinkVersion.v1_8,
-                FlinkVersion.v1_9,
-                FlinkVersion.v1_10,
-                FlinkVersion.v1_11,
-                FlinkVersion.v1_12,
-                FlinkVersion.v1_13,
-                FlinkVersion.v1_14);
+        return FlinkVersion.rangeOf(FlinkVersion.v1_3, FlinkVersion.v1_15);
     }
 
     public AbstractKeyedOperatorRestoreTestBase(FlinkVersion flinkVersion) {

diff --git a/...he/flink/test/state/operator/restore/unkeyed/AbstractNonKeyedOperatorRestoreTestBase.java b/...he/flink/test/state/operator/restore/unkeyed/AbstractNonKeyedOperatorRestoreTestBase.java
@@ -28,7 +28,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.Arrays;
 import java.util.Collection;
 
 import static org.apache.flink.test.state.operator.restore.unkeyed.NonKeyedJob.createFirstStatefulMap;
@@ -46,19 +45,7 @@ public abstract class AbstractNonKeyedOperatorRestoreTestBase
 
     @Parameterized.Parameters(name = "Migrate Savepoint: {0}")
     public static Collection<FlinkVersion> parameters() {
-        return Arrays.asList(
-                FlinkVersion.v1_3,
-                FlinkVersion.v1_4,
-                FlinkVersion.v1_5,
-                FlinkVersion.v1_6,
-                FlinkVersion.v1_7,
-                FlinkVersion.v1_8,
-                FlinkVersion.v1_9,
-                FlinkVersion.v1_10,
-                FlinkVersion.v1_11,
-                FlinkVersion.v1_12,
-                FlinkVersion.v1_13,
-                FlinkVersion.v1_14);
+        return FlinkVersion.rangeOf(FlinkVersion.v1_3, FlinkVersion.v1_15);
     }
 
     protected AbstractNonKeyedOperatorRestoreTestBase(FlinkVersion flinkVersion) {

diff --git a/flink-tests/src/test/resources/operatorstate/complexKeyed-flink1.15/_metadata b/flink-tests/src/test/resources/operatorstate/complexKeyed-flink1.15/_metadata
diff --git a/flink-tests/src/test/resources/operatorstate/nonKeyed-flink1.15/_metadata b/flink-tests/src/test/resources/operatorstate/nonKeyed-flink1.15/_metadata