[impala] 01/02: IMPALA-8650: Docker build should not depend on test config

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tarmstrong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit 3b15a5c55ab14a256f82c3d734444bc23ff1f267
Author: Tim Armstrong <ta...@cloudera.com>
AuthorDate: Wed Jun 12 10:38:06 2019 -0700

    IMPALA-8650: Docker build should not depend on test config
    
    Change-Id: Iaa70864f5d047d1ff5f21e69d8f6358306424c0b
    Reviewed-on: http://gerrit.cloudera.org:8080/13597
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
    Reviewed-by: Joe McDonnell <jo...@cloudera.com>
---
 bin/create-test-configuration.sh |  3 ---
 docker/CMakeLists.txt            |  1 -
 fe/CMakeLists.txt                | 19 -------------------
 3 files changed, 23 deletions(-)

diff --git a/bin/create-test-configuration.sh b/bin/create-test-configuration.sh
index 8d08562..2bcabe1 100755
--- a/bin/create-test-configuration.sh
+++ b/bin/create-test-configuration.sh
@@ -266,6 +266,3 @@ else
   # functional subdirectory.
   symlink_subdirs ${IMPALA_AUX_TEST_HOME}/tests ${IMPALA_HOME}/tests
 fi
-
-# Touch a file to mark when this script was last run.
-touch "${CONFIG_DIR}/.test_config_timestamp"
diff --git a/docker/CMakeLists.txt b/docker/CMakeLists.txt
index 07f4ae2..04c5b31 100644
--- a/docker/CMakeLists.txt
+++ b/docker/CMakeLists.txt
@@ -31,7 +31,6 @@ add_custom_command(
   COMMAND ${CMAKE_SOURCE_DIR}/docker/setup_build_context.py
   COMMAND touch ${IMPALA_BASE_BUILD_CONTEXT_TIMESTAMP}
   DEPENDS daemons fe ${CMAKE_SOURCE_DIR}/docker/setup_build_context.py
-  DEPENDS ${CMAKE_SOURCE_DIR}/fe/src/test/resources/.test_config_timestamp
   COMMENT "Creating impala base build context."
   VERBATIM
 )
diff --git a/fe/CMakeLists.txt b/fe/CMakeLists.txt
index 5453387..bd85290 100644
--- a/fe/CMakeLists.txt
+++ b/fe/CMakeLists.txt
@@ -19,22 +19,3 @@ add_custom_target(fe ALL DEPENDS
   shaded-deps thrift-deps fb-deps yarn-extras function-registry ext-data-source impala-parent
   COMMAND ${CMAKE_SOURCE_DIR}/bin/mvn-quiet.sh -B install -DskipTests
 )
-
-# Timestamp file is touched by bin/create-test-configuration.sh. This is used
-# for downstream targets like the docker build that need to pick up regenerated configs
-# when they change.
-set(TEST_CONFIGURATION_TIMESTAMP
-  ${CMAKE_SOURCE_DIR}/fe/src/test/resources/.test_config_timestamp
-)
-
-add_custom_command(
-  OUTPUT ${TEST_CONFIGURATION_TIMESTAMP}
-  COMMAND ${CMAKE_SOURCE_DIR}/bin/create-test-configuration.sh
-  DEPENDS ${CMAKE_SOURCE_DIR}/bin/create-test-configuration.sh
-  COMMENT "Creating test configuration."
-  VERBATIM
-)
-
-add_custom_target(test-configuration
-  DEPENDS ${TEST_CONFIGURATION_TIMESTAMP}
-)