This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1f7700c Disable use of test runners in circleci for JVM DTests
1f7700c is described below
commit 1f7700cf8bd6364f49138472b47676e46c023825
Author: Mick Semb Wever <[email protected]>
AuthorDate: Fri Mar 12 20:06:56 2021 +0100
Disable use of test runners in circleci for JVM DTests
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16511
---
.circleci/config-2_1.yml | 3 +++
.circleci/config.yml | 12 ++++++------
.circleci/config.yml.HIGHRES | 12 ++++++------
.circleci/config.yml.LOWRES | 12 ++++++------
.circleci/config.yml.MIDRES | 6 +++---
5 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml
index df42d10..36a13ca 100644
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@ -381,6 +381,7 @@ jobs:
- log_environment
- run_parallel_junit_tests:
classlistprefix: distributed
+ target: "testclasslist -Dtest.runners=1"
j11_jvm_dtests:
<<: *j11_small_par_executor
@@ -393,6 +394,7 @@ jobs:
- log_environment
- run_parallel_junit_tests:
classlistprefix: distributed
+ target: "testclasslist -Dtest.runners=1"
j8_jvm_upgrade_dtests:
<<: *j8_medium_par_executor
@@ -405,6 +407,7 @@ jobs:
- log_environment
- run_parallel_junit_tests:
classlistprefix: distributed
+ target: "testclasslist -Dtest.runners=1"
j11_unit_tests:
<<: *j11_par_executor
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5a41177..9f3765b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,7 +52,7 @@ jobs:
which java
java -version
- run:
- name: Run Unit Tests (testclasslist)
+ name: Run Unit Tests (testclasslist -Dtest.runners=1)
command: |
set -x
export PATH=$JAVA_HOME/bin:$PATH
@@ -65,7 +65,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.runners=1 -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
@@ -1218,7 +1218,7 @@ jobs:
which java
java -version
- run:
- name: Run Unit Tests (testclasslist)
+ name: Run Unit Tests (testclasslist -Dtest.runners=1)
command: |
set -x
export PATH=$JAVA_HOME/bin:$PATH
@@ -1231,7 +1231,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.runners=1 -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
@@ -1654,7 +1654,7 @@ jobs:
which java
java -version
- run:
- name: Run Unit Tests (testclasslist)
+ name: Run Unit Tests (testclasslist -Dtest.runners=1)
command: |
set -x
export PATH=$JAVA_HOME/bin:$PATH
@@ -1667,7 +1667,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.runners=1 -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES
index 5281902..fa2448c 100644
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@ -52,7 +52,7 @@ jobs:
which java
java -version
- run:
- name: Run Unit Tests (testclasslist)
+ name: Run Unit Tests (testclasslist -Dtest.runners=1)
command: |
set -x
export PATH=$JAVA_HOME/bin:$PATH
@@ -65,7 +65,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.runners=1 -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
@@ -1218,7 +1218,7 @@ jobs:
which java
java -version
- run:
- name: Run Unit Tests (testclasslist)
+ name: Run Unit Tests (testclasslist -Dtest.runners=1)
command: |
set -x
export PATH=$JAVA_HOME/bin:$PATH
@@ -1231,7 +1231,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.runners=1 -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
@@ -1654,7 +1654,7 @@ jobs:
which java
java -version
- run:
- name: Run Unit Tests (testclasslist)
+ name: Run Unit Tests (testclasslist -Dtest.runners=1)
command: |
set -x
export PATH=$JAVA_HOME/bin:$PATH
@@ -1667,7 +1667,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.runners=1 -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES
index 5a41177..9f3765b 100644
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@ -52,7 +52,7 @@ jobs:
which java
java -version
- run:
- name: Run Unit Tests (testclasslist)
+ name: Run Unit Tests (testclasslist -Dtest.runners=1)
command: |
set -x
export PATH=$JAVA_HOME/bin:$PATH
@@ -65,7 +65,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.runners=1 -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
@@ -1218,7 +1218,7 @@ jobs:
which java
java -version
- run:
- name: Run Unit Tests (testclasslist)
+ name: Run Unit Tests (testclasslist -Dtest.runners=1)
command: |
set -x
export PATH=$JAVA_HOME/bin:$PATH
@@ -1231,7 +1231,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.runners=1 -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
@@ -1654,7 +1654,7 @@ jobs:
which java
java -version
- run:
- name: Run Unit Tests (testclasslist)
+ name: Run Unit Tests (testclasslist -Dtest.runners=1)
command: |
set -x
export PATH=$JAVA_HOME/bin:$PATH
@@ -1667,7 +1667,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.runners=1 -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
diff --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES
index c99edad..fc51b2b 100644
--- a/.circleci/config.yml.MIDRES
+++ b/.circleci/config.yml.MIDRES
@@ -65,7 +65,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed -Dtest.runners=1
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
@@ -1231,7 +1231,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed -Dtest.runners=1
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
@@ -1667,7 +1667,7 @@ jobs:
if [ -z "$test_timeout" ]; then
test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"'
'{print $4}')
fi
- ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed
+ ant testclasslist -Dtest.timeout="$test_timeout"
-Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-Dtest.classlistprefix=distributed -Dtest.runners=1
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/build/test/output/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
