[FLINK-19619][e2e] Pin CloudSDK version to have access to pubsub emul…

…ator in test The :latest version of google/cloud-sdk:latest has the pubsub emulator disabled. Google plans to add it again at a later point. See GoogleCloudPlatform/cloud-sdk-docker#225 for details.
deepfield · Oct 19, 2020 · 5ffdc4e · 5ffdc4e
1 parent 9eae578
commit 5ffdc4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...java/org/apache/flink/streaming/connectors/gcp/pubsub/emulator/GCloudEmulatorManager.java b/...java/org/apache/flink/streaming/connectors/gcp/pubsub/emulator/GCloudEmulatorManager.java
@@ -57,7 +57,8 @@ public class GCloudEmulatorManager {
  private static String dockerIpAddress = "127.0.0.1";
 
  public static final String INTERNAL_PUBSUB_PORT = "22222";
- public static final String DOCKER_IMAGE_NAME = "google/cloud-sdk:latest";
+ // TODO: use :latest again once https://github.com/GoogleCloudPlatform/cloud-sdk-docker/issues/225 is resolved.
+ public static final String DOCKER_IMAGE_NAME = "google/cloud-sdk:313.0.0";
 
  private static String pubsubPort;
 
@@ -120,6 +121,7 @@ public static void launchDocker() throws DockerException, InterruptedException,
  .cmd("sh", "-c", "mkdir -p /opt/data/pubsub ; gcloud beta emulators pubsub start --data-dir=/opt/data/pubsub --host-port=0.0.0.0:" + INTERNAL_PUBSUB_PORT)
  .build();
 
+ LOG.debug("Launching container with configuration {}", containerConfig);
  final ContainerCreation creation = docker.createContainer(containerConfig, CONTAINER_NAME_JUNIT);
  id = creation.id();
 

diff --git a/flink-end-to-end-tests/run-nightly-tests.sh b/flink-end-to-end-tests/run-nightly-tests.sh
@@ -142,8 +142,7 @@ if [[ ${PROFILE} != *"jdk11"* ]]; then
  run_test "Run Mesos multiple submission test" "$END_TO_END_DIR/test-scripts/test_mesos_multiple_submissions.sh"
 
  # `google/cloud-sdk` docker image doesn't support aarch64 currently.
- # Disabled until https://issues.apache.org/jira/browse/FLINK-19619 is fixed.
- #run_test "Test PubSub connector with Docker based Google PubSub Emulator" "$END_TO_END_DIR/test-scripts/test_streaming_gcp_pubsub.sh"
+ run_test "Test PubSub connector with Docker based Google PubSub Emulator" "$END_TO_END_DIR/test-scripts/test_streaming_gcp_pubsub.sh"
  fi
 fi