You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2020/01/29 08:45:49 UTC
[cassandra] branch cassandra-3.11 updated (f2a36e1 -> 3bcabdc)
This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from f2a36e1 Merge branch 'cassandra-3.0' into cassandra-3.11
new 6e3bf54 Use testclasslist for jvm dtests in circleci
new a6dd3b8 Merge branch 'cassandra-2.2' into cassandra-3.0
new 3bcabdc Merge branch 'cassandra-3.0' into cassandra-3.11
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.circleci/config-2_1.yml | 65 +++++++++++++----
.circleci/config-2_1.yml.high_res.patch | 14 +++-
.circleci/config.yml | 115 ++++++++++++++++++++++++++----
.circleci/config.yml.HIGHRES | 119 +++++++++++++++++++++++++++-----
.circleci/config.yml.LOWRES | 115 ++++++++++++++++++++++++++----
5 files changed, 368 insertions(+), 60 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3bcabdc5d2131e43f37fab456e1846bc245b2ac8
Merge: f2a36e1 a6dd3b8
Author: Marcus Eriksson <ma...@apache.org>
AuthorDate: Wed Jan 29 09:36:33 2020 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
.circleci/config-2_1.yml | 65 +++++++++++++----
.circleci/config-2_1.yml.high_res.patch | 14 +++-
.circleci/config.yml | 115 ++++++++++++++++++++++++++----
.circleci/config.yml.HIGHRES | 119 +++++++++++++++++++++++++++-----
.circleci/config.yml.LOWRES | 115 ++++++++++++++++++++++++++----
5 files changed, 368 insertions(+), 60 deletions(-)
diff --cc .circleci/config-2_1.yml
index b55b1fb,6b59a4f..5cbe288
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@@ -54,19 -66,11 +66,18 @@@ with_dtests_jobs: &with_dtest_job
- utests_compression:
requires:
- start_utests_compression
+ - start_utests_stress:
+ type: approval
+ requires:
+ - build
+ - utests_stress:
+ requires:
+ - start_utests_stress
- start_jvm_upgrade_dtest:
type: approval
+ - j8_dtest_jars_build:
requires:
- build
- - dtest_jars_build:
- requires:
- start_jvm_upgrade_dtest
- j8_jvm_upgrade_dtests:
requires:
@@@ -159,15 -163,19 +170,19 @@@ jobs
- run_parallel_junit_tests
j8_jvm_dtests:
-- <<: *j8_seq_executor
++ <<: *j8_small_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- - run_junit_tests:
- target: test-jvm-dtest-forking
+ - create_junit_containers:
+ classlistprefix: distributed
+ extra_filters: "| grep -v upgrade"
+ - log_environment
+ - run_parallel_junit_tests:
+ classlistprefix: distributed
j8_jvm_upgrade_dtests:
-- <<: *j8_seq_executor
++ <<: *j8_medium_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@@ -387,6 -398,6 +413,9 @@@ commands
no_output_timeout:
type: string
default: 15m
++ classlistprefix:
++ type: string
++ default: unit
steps:
- run:
name: Run Unit Tests (<<parameters.target>>)
@@@ -399,7 -410,7 +428,7 @@@
if [ -d ~/dtest_jars ]; then
cp ~/dtest_jars/dtest* /tmp/cassandra/build/
fi
-- ant clean <<parameters.target>>
++ ant <<parameters.target>> -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt -Dtest.classlistprefix=<<parameters.classlistprefix>>
no_output_timeout: <<parameters.no_output_timeout>>
- store_test_results:
path: /tmp/cassandra/build/test/output/
diff --cc .circleci/config.yml
index e0c65f4,817d726..4108359
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@@ -284,52 -325,6 +325,52 @@@ jobs
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ utests_stress:
+ docker:
+ - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ resource_class: medium
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 1
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Run Unit Tests (stress-test)
+ command: |
+ export PATH=$JAVA_HOME/bin:$PATH
+ time mv ~/cassandra /tmp
+ cd /tmp/cassandra
+ if [ -d ~/dtest_jars ]; then
+ cp ~/dtest_jars/dtest* /tmp/cassandra/build/
+ fi
- ant clean stress-test
++ ant stress-test -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt -Dtest.classlistprefix=unit
+ no_output_timeout: 15m
+ - store_test_results:
+ path: /tmp/cassandra/build/test/output/
+ - store_artifacts:
+ path: /tmp/cassandra/build/test/output
+ destination: junitxml
+ - store_artifacts:
+ path: /tmp/cassandra/build/test/logs
+ destination: logs
+ environment:
+ - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_unit_tests:
docker:
- image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
@@@ -537,7 -576,7 +622,7 @@@
if [ -d ~/dtest_jars ]; then
cp ~/dtest_jars/dtest* /tmp/cassandra/build/
fi
-- ant clean long-test
++ ant long-test -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt -Dtest.classlistprefix=unit
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
@@@ -742,19 -784,11 +830,18 @@@ workflows
- utests_compression:
requires:
- start_utests_compression
+ - start_utests_stress:
+ type: approval
+ requires:
+ - build
+ - utests_stress:
+ requires:
+ - start_utests_stress
- start_jvm_upgrade_dtest:
type: approval
+ - j8_dtest_jars_build:
requires:
- build
- - dtest_jars_build:
- requires:
- start_jvm_upgrade_dtest
- j8_jvm_upgrade_dtests:
requires:
diff --cc .circleci/config.yml.HIGHRES
index c6688d9,b1e138c..ac61b7f
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@@ -6,7 -6,7 +6,7 @@@ jobs
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
-- parallelism: 1
++ parallelism: 2
steps:
- attach_workspace:
at: /home/cassandra
@@@ -284,52 -325,6 +325,52 @@@
- CCM_HEAP_NEWSIZE: 512M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ utests_stress:
+ docker:
+ - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ resource_class: xlarge
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 1
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Run Unit Tests (stress-test)
+ command: |
+ export PATH=$JAVA_HOME/bin:$PATH
+ time mv ~/cassandra /tmp
+ cd /tmp/cassandra
+ if [ -d ~/dtest_jars ]; then
+ cp ~/dtest_jars/dtest* /tmp/cassandra/build/
+ fi
- ant clean stress-test
++ ant stress-test -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt -Dtest.classlistprefix=unit
+ no_output_timeout: 15m
+ - store_test_results:
+ path: /tmp/cassandra/build/test/output/
+ - store_artifacts:
+ path: /tmp/cassandra/build/test/output
+ destination: junitxml
+ - store_artifacts:
+ path: /tmp/cassandra/build/test/logs
+ destination: logs
+ environment:
+ - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 2048M
+ - CCM_HEAP_NEWSIZE: 512M
+ - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_unit_tests:
docker:
- image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
@@@ -478,7 -476,7 +522,7 @@@
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
-- parallelism: 1
++ parallelism: 2
steps:
- attach_workspace:
at: /home/cassandra
@@@ -537,7 -576,7 +622,7 @@@
if [ -d ~/dtest_jars ]; then
cp ~/dtest_jars/dtest* /tmp/cassandra/build/
fi
-- ant clean long-test
++ ant long-test -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt -Dtest.classlistprefix=unit
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
@@@ -742,19 -784,11 +830,18 @@@ workflows
- utests_compression:
requires:
- start_utests_compression
+ - start_utests_stress:
+ type: approval
+ requires:
+ - build
+ - utests_stress:
+ requires:
+ - start_utests_stress
- start_jvm_upgrade_dtest:
type: approval
+ - j8_dtest_jars_build:
requires:
- build
- - dtest_jars_build:
- requires:
- start_jvm_upgrade_dtest
- j8_jvm_upgrade_dtests:
requires:
diff --cc .circleci/config.yml.LOWRES
index e0c65f4,817d726..4108359
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@@ -284,52 -325,6 +325,52 @@@ jobs
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ utests_stress:
+ docker:
+ - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ resource_class: medium
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 1
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Run Unit Tests (stress-test)
+ command: |
+ export PATH=$JAVA_HOME/bin:$PATH
+ time mv ~/cassandra /tmp
+ cd /tmp/cassandra
+ if [ -d ~/dtest_jars ]; then
+ cp ~/dtest_jars/dtest* /tmp/cassandra/build/
+ fi
- ant clean stress-test
++ ant stress-test -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt -Dtest.classlistprefix=unit
+ no_output_timeout: 15m
+ - store_test_results:
+ path: /tmp/cassandra/build/test/output/
+ - store_artifacts:
+ path: /tmp/cassandra/build/test/output
+ destination: junitxml
+ - store_artifacts:
+ path: /tmp/cassandra/build/test/logs
+ destination: logs
+ environment:
+ - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_unit_tests:
docker:
- image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
@@@ -537,7 -576,7 +622,7 @@@
if [ -d ~/dtest_jars ]; then
cp ~/dtest_jars/dtest* /tmp/cassandra/build/
fi
-- ant clean long-test
++ ant long-test -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt -Dtest.classlistprefix=unit
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
@@@ -742,19 -784,11 +830,18 @@@ workflows
- utests_compression:
requires:
- start_utests_compression
+ - start_utests_stress:
+ type: approval
+ requires:
+ - build
+ - utests_stress:
+ requires:
+ - start_utests_stress
- start_jvm_upgrade_dtest:
type: approval
+ - j8_dtest_jars_build:
requires:
- build
- - dtest_jars_build:
- requires:
- start_jvm_upgrade_dtest
- j8_jvm_upgrade_dtests:
requires:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org