This is an automated email from the ASF dual-hosted git repository.
mikeb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit 365e35a36f142532044d8a34cbb87646bf9cb240
Author: Philip Zeyliger <phi...@cloudera.com>
AuthorDate: Tue Jan 22 11:58:34 2019 -0800
Using 'master' branch of Impala-lzo and allowing test-with-docker to
configure it.
This updates bootstrap_system.sh to check out the 'master' branch of
Impala-lzo. (I've separately updated the 'master' branch to
be identical to today's cdh5-trunk branch; it had grown a few
years stale.) I've also added support to teasing the configuration
through test-with-docker.
This allows for Impala 2.x and 3.x to diverge here, and it allows
for testing changes to Impala-lzo.
Change-Id: Ieba45fc18d9e490f75d16c477cdc1cce26f41ce9
Reviewed-on: http://gerrit.cloudera.org:8080/12259
Reviewed-by: Impala Public Jenkins <impala-public-jenk...@cloudera.com>
Tested-by: Impala Public Jenkins <impala-public-jenk...@cloudera.com>
---
bin/bootstrap_system.sh | 2 +-
docker/entrypoint.sh | 8 ++++++++
docker/test-with-docker.py | 14 +++++++++++++-
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/bin/bootstrap_system.sh b/bin/bootstrap_system.sh
index 28df210..9b2d070 100755
--- a/bin/bootstrap_system.sh
+++ b/bin/bootstrap_system.sh
@@ -318,7 +318,7 @@ echo ">>> Checking out Impala-lzo"
: ${IMPALA_LZO_HOME:="${IMPALA_HOME}/../Impala-lzo"}
if ! [[ -d "$IMPALA_LZO_HOME" ]]
then
- git clone https://github.com/cloudera/impala-lzo.git "$IMPALA_LZO_HOME"
+ git clone --branch master https://github.com/cloudera/impala-lzo.git
"$IMPALA_LZO_HOME"
fi
echo ">>> Checking out and building hadoop-lzo"
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 58eb5ef..8e78dfb 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -197,6 +197,14 @@ function build_impdev() {
git fetch /git_common_dir --no-tags "$GIT_HEAD_REV"
git checkout -b test-with-docker FETCH_HEAD
+ # Checkout impala-lzo too
+ mkdir /home/impdev/Impala-lzo
+ pushd /home/impdev/Impala-lzo
+ git init
+ git fetch $IMPALA_LZO_REPO --no-tags "$IMPALA_LZO_REF"
+ git checkout -b test-with-docker FETCH_HEAD
+ popd
+
# Link in logs. Logs are on the host since that's the most important thing to
# look at after the tests are run.
ln -sf /logs logs
diff --git a/docker/test-with-docker.py b/docker/test-with-docker.py
index c9d688e..8bb35b0 100755
--- a/docker/test-with-docker.py
+++ b/docker/test-with-docker.py
@@ -184,6 +184,11 @@ def main():
default=os.path.expanduser("~/.ccache"))
parser.add_argument('--tail', action="store_true",
help="Run tail on all container log files.")
+ parser.add_argument('--impala-lzo-repo',
+ default="https://github.com/cloudera/impala-lzo.git";,
+ help="Git repo for Impala-lzo repo")
+ parser.add_argument('--impala-lzo-ref', default='master',
+ help="Branch name for Impala-lzo repo.")
parser.add_argument('--env', metavar='K=V', default=[], action='append',
help="""Passes given environment variables (expressed as KEY=VALUE)
through containers.
@@ -205,6 +210,8 @@ def main():
suite_concurrency=args.suite_concurrency,
impalad_mem_limit_bytes=args.impalad_mem_limit_bytes,
tail=args.tail,
+ impala_lzo_repo=args.impala_lzo_repo,
+ impala_lzo_ref=args.impala_lzo_ref,
env=args.env, base_image=args.base_image)
fh = logging.FileHandler(os.path.join(_make_dir_if_not_exist(t.log_dir),
"log.txt"))
@@ -438,7 +445,8 @@ class TestWithDocker(object):
def __init__(self, build_image, suite_names, name, cleanup_containers,
cleanup_image, ccache_dir, test_mode,
suite_concurrency, parallel_test_concurrency,
- impalad_mem_limit_bytes, tail, env, base_image):
+ impalad_mem_limit_bytes, tail,
+ impala_lzo_repo, impala_lzo_ref, env, base_image):
self.build_image = build_image
self.name = name
self.containers = []
@@ -474,6 +482,8 @@ class TestWithDocker(object):
self.parallel_test_concurrency = parallel_test_concurrency
self.impalad_mem_limit_bytes = impalad_mem_limit_bytes
self.tail = tail
+ self.impala_lzo_repo = impala_lzo_repo
+ self.impala_lzo_ref = impala_lzo_ref
self.env = env
self.base_image = base_image
@@ -558,6 +568,8 @@ class TestWithDocker(object):
"-v", self.git_root + ":/repo:ro",
"-v", self.git_common_dir + ":/git_common_dir:ro",
"-e", "GIT_HEAD_REV=" + self.git_head_rev,
+ "-e", "IMPALA_LZO_REPO=" + self.impala_lzo_repo,
+ "-e", "IMPALA_LZO_REF=" + self.impala_lzo_ref,
# Share timezone between host and container
"-e", "LOCALTIME_LINK_TARGET=" + localtime_link_target,
"-v", self.ccache_dir + ":/ccache",
