This is an automated email from the ASF dual-hosted git repository. kurt pushed a commit to branch release-1.9 in repository https://gitbox.apache.org/repos/asf/flink.git
commit 13de7c332b9004ec83da65d375166a60707a31d1 Author: Kurt Young <k...@apache.org> AuthorDate: Tue Aug 6 14:52:55 2019 +0800 [FLINK-13592][e2e] Fix hardcoded flink version in tpch end-to-end test. This closes #9368. (cherry picked from commit 648fc72253e73e22593eeab117105b59a2c3df90) --- flink-end-to-end-tests/flink-tpch-test/pom.xml | 16 ++++++++++++++++ flink-end-to-end-tests/test-scripts/test_tpch.sh | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/flink-end-to-end-tests/flink-tpch-test/pom.xml b/flink-end-to-end-tests/flink-tpch-test/pom.xml index c6afb27..9e16ff1 100644 --- a/flink-end-to-end-tests/flink-tpch-test/pom.xml +++ b/flink-end-to-end-tests/flink-tpch-test/pom.xml @@ -55,6 +55,22 @@ under the License. </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <id>TpchTestProgram</id> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <finalName>TpchTestProgram</finalName> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/flink-end-to-end-tests/test-scripts/test_tpch.sh b/flink-end-to-end-tests/test-scripts/test_tpch.sh index ab4c61c..ede1f0d 100755 --- a/flink-end-to-end-tests/test-scripts/test_tpch.sh +++ b/flink-end-to-end-tests/test-scripts/test_tpch.sh @@ -31,7 +31,7 @@ echo "Generating test data..." TARGET_DIR="$END_TO_END_DIR/flink-tpch-test/target" TPCH_DATA_DIR="$END_TO_END_DIR/test-scripts/test-data/tpch" -java -cp "$TARGET_DIR/flink-tpch-test-1.10-SNAPSHOT.jar:$TARGET_DIR/lib/*" org.apache.flink.table.tpch.TpchDataGenerator "$SCALE" "$TARGET_DIR" +java -cp "$TARGET_DIR/TpchTestProgram.jar:$TARGET_DIR/lib/*" org.apache.flink.table.tpch.TpchDataGenerator "$SCALE" "$TARGET_DIR" ################################################################################ # Prepare Flink @@ -87,5 +87,5 @@ EOF wait_job_terminal_state "$JOB_ID" "FINISHED" - java -cp "$TARGET_DIR/flink-tpch-test-1.10-SNAPSHOT.jar" org.apache.flink.table.tpch.TpchResultComparator "$EXPECTED_DIR/q$i.csv" "$RESULT_DIR/q$i.csv" + java -cp "$TARGET_DIR/TpchTestProgram.jar" org.apache.flink.table.tpch.TpchResultComparator "$EXPECTED_DIR/q$i.csv" "$RESULT_DIR/q$i.csv" done