You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by xv...@apache.org on 2021/04/06 18:34:31 UTC
[druid] 05/09: sync integration tests with pom ZK version
This is an automated email from the ASF dual-hosted git repository.
xvrl pushed a commit to branch jdk15-zk3.5
in repository https://gitbox.apache.org/repos/asf/druid.git
commit 6630983258b0b272caaf8ec89fd13ec3c6641901
Author: Xavier Léauté <xv...@apache.org>
AuthorDate: Fri Mar 5 11:30:22 2021 -0800
sync integration tests with pom ZK version
---
.travis.yml | 19 +------------------
integration-tests/docker/base-setup.sh | 7 +------
integration-tests/pom.xml | 3 +--
pom.xml | 3 ---
4 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 29bf971..be8cbaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,6 @@ cache:
env:
global:
- - ZK_VERSION=3.5 # default ZK version for integration tests
- DOCKER_IP=127.0.0.1 # for integration tests
- MVN="mvn -B"
- > # Various options to make execution of maven goals faster (e.g., mvn install)
@@ -340,7 +339,7 @@ jobs:
- docker
env: TESTNG_GROUPS='-Dgroups=batch-index' JVM_RUNTIME='-Djvm.runtime=8' USE_INDEXER='middleManager'
script: &run_integration_test
- - ${MVN} verify -pl integration-tests -P integration-tests ${TESTNG_GROUPS} ${JVM_RUNTIME} -Dit.indexer=${USE_INDEXER} -Dzk.version=${ZK_VERSION} ${MAVEN_SKIP}
+ - ${MVN} verify -pl integration-tests -P integration-tests ${TESTNG_GROUPS} ${JVM_RUNTIME} -Dit.indexer=${USE_INDEXER} ${MAVEN_SKIP}
after_failure: &integration_test_diags
- for v in ~/shared/logs/*.log ; do
echo $v logtail ======================== ; tail -100 $v ;
@@ -543,16 +542,6 @@ jobs:
jdk: openjdk8
env: TESTNG_GROUPS='-Dgroups=high-availability' JVM_RUNTIME='-Djvm.runtime=8' USE_INDEXER='middleManager'
- # Subset of integration tests to run with ZooKeeper 3.4.x for backwards compatibility
- - <<: *integration_tests
- name: "(Compile=openjdk8, Run=openjdk8, ZK=3.4) leadership and high availability integration tests"
- jdk: openjdk8
- env: TESTNG_GROUPS='-Dgroups=high-availability' JVM_RUNTIME='-Djvm.runtime=8' USE_INDEXER='middleManager' ZK_VERSION=3.4
-
- - <<: *integration_kafka_format_tests
- name: "(Compile=openjdk8, Run=openjdk8, ZK=3.4) Kafka index integration test with various formats"
- env: TESTNG_GROUPS='-Dgroups=kafka-data-format' JVM_RUNTIME='-Djvm.runtime=8' USE_INDEXER='middleManager' ZK_VERSION=3.4
-
# END - Integration tests for Compile with Java 8 and Run with Java 8
# START - Integration tests for Compile with Java 8 and Run with Java 11
@@ -621,12 +610,6 @@ jobs:
jdk: openjdk8
env: TESTNG_GROUPS='-Dgroups=high-availability' JVM_RUNTIME='-Djvm.runtime=11' USE_INDEXER='middleManager'
- # Subset of integration tests to run with ZooKeeper 3.4.x for backwards compatibility
- - <<: *integration_tests
- name: "(Compile=openjdk8, Run=openjdk11, ZK=3.4) leadership and high availability integration tests"
- jdk: openjdk8
- env: TESTNG_GROUPS='-Dgroups=high-availability' JVM_RUNTIME='-Djvm.runtime=11' USE_INDEXER='middleManager' ZK_VERSION=3.4
-
# END - Integration tests for Compile with Java 8 and Run with Java 11
- &integration_batch_index_k8s
diff --git a/integration-tests/docker/base-setup.sh b/integration-tests/docker/base-setup.sh
index e68f6bc..7d49fe2 100755
--- a/integration-tests/docker/base-setup.sh
+++ b/integration-tests/docker/base-setup.sh
@@ -40,15 +40,10 @@ install_zk() {
rm /tmp/$ZK_TAR.tar.gz
}
-ZK_VERSION=3.4.14
-ZK_TAR=zookeeper-$ZK_VERSION
-install_zk
-ln -s /usr/local/$ZK_TAR /usr/local/zookeeper-3.4
-
ZK_VERSION=3.5.9
ZK_TAR=apache-zookeeper-$ZK_VERSION-bin
install_zk
-ln -s /usr/local/$ZK_TAR /usr/local/zookeeper-3.5
+ln -s /usr/local/$ZK_TAR /usr/local/zookeeper-$ZK_VERSION
# Kafka
# Match the version to the Kafka client used by KafkaSupervisor
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 2fb9adc..ee08d6f 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -435,7 +435,6 @@
<docker.build.skip>false</docker.build.skip>
<docker.build.hadoop>false</docker.build.hadoop>
<it.indexer>middleManager</it.indexer>
- <zk.version>3.5</zk.version>
<override.config.path />
<resource.file.dir.path />
@@ -466,7 +465,7 @@
<DRUID_INTEGRATION_TEST_SKIP_RUN_DOCKER>${docker.run.skip}</DRUID_INTEGRATION_TEST_SKIP_RUN_DOCKER>
<DRUID_INTEGRATION_TEST_INDEXER>${it.indexer}</DRUID_INTEGRATION_TEST_INDEXER>
<MYSQL_VERSION>${mysql.version}</MYSQL_VERSION>
- <ZK_VERSION>${zk.version}</ZK_VERSION>
+ <ZK_VERSION>${zookeeper.version}</ZK_VERSION>
</environmentVariables>
<executable>${project.basedir}/build_run_cluster.sh</executable>
</configuration>
diff --git a/pom.xml b/pom.xml
index 034893a..ed7bcb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,9 +112,6 @@
<aws.sdk.version>1.11.884</aws.sdk.version>
<caffeine.version>2.8.0</caffeine.version>
<jacoco.version>0.8.6</jacoco.version>
- <!-- Curator requires 3.4.x ZooKeeper clients to maintain compatibility with 3.4.x ZooKeeper servers,
- If we upgrade to 3.5.x clients, curator requires 3.5.x servers, which would break backwards compatibility
- see http://curator.apache.org/zk-compatibility.html -->
<!-- When upgrading ZK, edit docs and integration tests as well (integration-tests/docker-base/setup.sh) -->
<zookeeper.version>3.5.9</zookeeper.version>
<checkerframework.version>2.5.7</checkerframework.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org