Skip to content

Commit

Permalink
Merge branch '1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelsembwever
michaelsembwever committed Aug 7, 2018
2 parents 37c3811 + 56ab26e commit 53a158b
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 43 deletions.
85 changes: 43 additions & 42 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ aliases:
ccm populate --vnodes -n 2:2
sed -i 's/etc\/cassandra\/jmxremote.password/home\/circleci\/.local\/jmxremote.password/' /home/circleci/.ccm/test/node1/conf/cassandra-env.sh
sed -i 's/etc\/cassandra\/jmxremote.password/home\/circleci\/.local\/jmxremote.password/' /home/circleci/.ccm/test/node2/conf/cassandra-env.sh
if [ echo $JOB_COMMAND | grep -q " ~@all_nodes_reachable" ] ; then
# run scenarios without @all_nodes_reachable against an unreachable DC2
if [ echo $JOB_COMMAND | grep -q "-Pskip-tests-needing-all-nodes-reachable" ] ; then
# scenarios that are not tagged with @all_nodes_reachable can be tested against an unreachable DC2
sed -i 's/etc\/cassandra\/jmxremote.password/home\/circleci\/.local\/jmxremote.blank.password/' /home/circleci/.ccm/test/node3/conf/cassandra-env.sh
sed -i 's/etc\/cassandra\/jmxremote.password/home\/circleci\/.local\/jmxremote.blank.password/' /home/circleci/.ccm/test/node4/conf/cassandra-env.sh
else
Expand Down Expand Up @@ -142,202 +142,203 @@ jobs:
c_2-1_memory:
environment:
CASSANDRA_VERSION: 2.1.19
JOB_COMMAND: mvn surefire:test -Dtest=ReaperIT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -Dtest=ReaperIT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_2-1_h2:
environment:
CASSANDRA_VERSION: 2.1.19
JOB_COMMAND: mvn surefire:test -Dtest=ReaperH2IT -Dcucumber.options="-t ~@all_nodes_reachable"

JOB_COMMAND: mvn surefire:test -Dtest=ReaperH2IT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_2-1_one-reaper:
environment:
CASSANDRA_VERSION: 2.1.19
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_2-1_two-reapers:
environment:
CASSANDRA_VERSION: 2.1.19
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable" -Dcucumber.options="-t ~@all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
<<: *default_job
c_2-1_flapping-reapers:
environment:
CASSANDRA_VERSION: 2.1.19
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
<<: *default_job
c_2-1_one-reaper_incremental:
environment:
CASSANDRA_VERSION: 2.1.19
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable
<<: *default_job
c_2-1_two-reapers_incremental:
environment:
CASSANDRA_VERSION: 2.1.19
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
<<: *default_job
c_2-1_flapping-reapers_incremental:
environment:
CASSANDRA_VERSION: 2.1.19
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
<<: *default_job
c_2-2_memory:
environment:
CASSANDRA_VERSION: 2.2.11
JOB_COMMAND: mvn surefire:test -Dtest=ReaperIT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -Dtest=ReaperIT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_2-2_h2:
environment:
CASSANDRA_VERSION: 2.2.11
JOB_COMMAND: mvn surefire:test -Dtest=ReaperH2IT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -Dtest=ReaperH2IT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_2-2_one-reaper:
environment:
CASSANDRA_VERSION: 2.2.11
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_2-2_two-reapers:
environment:
CASSANDRA_VERSION: 2.2.11
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
<<: *default_job
c_2-2_flapping-reapers:
environment:
CASSANDRA_VERSION: 2.2.11
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
<<: *default_job
c_2-2_one-reaper_incremental:
environment:
CASSANDRA_VERSION: 2.2.11
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable
<<: *default_job
c_2-2_two-reapers_incremental:
environment:
CASSANDRA_VERSION: 2.2.11
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
<<: *default_job
c_2-2_flapping-reapers_incremental:
environment:
CASSANDRA_VERSION: 2.2.11
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
<<: *default_job
c_3-0_memory:
environment:
CASSANDRA_VERSION: 3.0.15
JOB_COMMAND: mvn surefire:test -Dtest=ReaperIT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -Dtest=ReaperIT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_3-0_h2:
environment:
CASSANDRA_VERSION: 3.0.15
JOB_COMMAND: mvn surefire:test -Dtest=ReaperH2IT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -Dtest=ReaperH2IT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_3-0_one-reaper:
environment:
CASSANDRA_VERSION: 3.0.15
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_3-0_two-reapers:
environment:
CASSANDRA_VERSION: 3.0.15
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
<<: *default_job
c_3-0_flapping-reapers:
environment:
CASSANDRA_VERSION: 3.0.15
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
<<: *default_job
c_3-0_one-reaper_incremental:
environment:
CASSANDRA_VERSION: 3.0.15
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable
<<: *default_job
c_3-0_two-reapers_incremental:
environment:
CASSANDRA_VERSION: 3.0.15
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
<<: *default_job
c_3-0_flapping-reapers_incremental:
environment:
CASSANDRA_VERSION: 3.0.15
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
<<: *default_job
c_3-11_memory:
environment:
CASSANDRA_VERSION: 3.11.2
JOB_COMMAND: mvn surefire:test -Dtest=ReaperIT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -Dtest=ReaperIT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_3-11_h2:
environment:
CASSANDRA_VERSION: 3.11.2
JOB_COMMAND: mvn surefire:test -Dtest=ReaperH2IT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -Dtest=ReaperH2IT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_3-11_one-reaper:
environment:
CASSANDRA_VERSION: 3.11.2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_3-11_two-reapers:
environment:
CASSANDRA_VERSION: 3.11.2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
<<: *default_job
c_3-11_flapping-reapers:
environment:
CASSANDRA_VERSION: 3.11.2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
<<: *default_job
c_3-11_one-reaper_incremental:
environment:
CASSANDRA_VERSION: 3.11.2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable
<<: *default_job
c_3-11_two-reapers_incremental:
environment:
CASSANDRA_VERSION: 3.11.2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
<<: *default_job
c_3-11_flapping-reapers_incremental:
environment:
CASSANDRA_VERSION: 3.11.2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
<<: *default_job
c_4-0_memory:
environment:
CASSANDRA_VERSION: git:trunk
JOB_COMMAND: mvn surefire:test -Dtest=ReaperIT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -Dtest=ReaperIT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_4-0_h2:
environment:
CASSANDRA_VERSION: git:trunk
JOB_COMMAND: mvn surefire:test -Dtest=ReaperH2IT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -Dtest=ReaperH2IT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_4-0_one-reaper:
environment:
CASSANDRA_VERSION: git:trunk
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable
<<: *default_job
c_4-0_two-reapers:
environment:
CASSANDRA_VERSION: git:trunk
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
<<: *default_job
c_4-0_flapping-reapers:
environment:
CASSANDRA_VERSION: git:trunk
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t ~@all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Pskip-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
<<: *default_job
c_4-0_one-reaper_incremental:
environment:
CASSANDRA_VERSION: git:trunk
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable"
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable
<<: *default_job
c_4-0_two-reapers_incremental:
environment:
CASSANDRA_VERSION: git:trunk
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=2
<<: *default_job
c_4-0_flapping-reapers_incremental:
environment:
CASSANDRA_VERSION: git:trunk
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Dcucumber.options="-t @all_nodes_reachable" -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
JOB_COMMAND: mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIT -Ponly-tests-needing-all-nodes-reachable -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
<<: *default_job
workflows:
version: 2
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@
<build.jdk.minimum>1.8.0-151</build.jdk.minimum>
<!-- travis of July 2018 was still using maven-3.5.2 -->
<maven.version.minimum>3.5.2</maven.version.minimum>
<surefireArgLine></surefireArgLine>

<!--
Properties that influence various parts of the NetBeans IDE, especially code formatting and the like.
Expand Down
31 changes: 30 additions & 1 deletion src/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,36 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>skip-tests-needing-all-nodes-reachable</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<argLine>${surefireArgLine} -Dcucumber.options="-t ~@all_nodes_reachable"</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>only-tests-needing-all-nodes-reachable</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<argLine>${surefireArgLine} -Dcucumber.options="-t @all_nodes_reachable"</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<reporting>
<plugins>
<plugin>
Expand Down

0 comments on commit 53a158b

Please sign in to comment.