This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
new 8b8ec94 When jvm dtest apis differ Circle CI's dtest_jars_build can
fail to detect this and will use the jars from the older version
8b8ec94 is described below
commit 8b8ec94744c70b5770c98b22f641ca7f492e0534
Author: David Capwell <[email protected]>
AuthorDate: Mon Aug 3 13:58:42 2020 -0700
When jvm dtest apis differ Circle CI's dtest_jars_build can fail to detect
this and will use the jars from the older version
patch by David Capwell; reviewed by Caleb Rackliffe for CASSANDRA-16004
---
.circleci/config-2_1.yml | 14 ++++++++++----
.circleci/config.yml | 14 ++++++++++----
.circleci/config.yml.HIGHRES | 14 ++++++++++----
.circleci/config.yml.LOWRES | 14 ++++++++++----
4 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml
index f2c4f50..d7d48c0 100644
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@ -318,6 +318,7 @@ commands:
command: |
export PATH=$JAVA_HOME/bin:$PATH
cd ~/cassandra
+ mkdir ~/dtest_jars
git remote add apache git://github.com/apache/cassandra.git
for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 trunk; do
# check out the correct cassandra version:
@@ -326,9 +327,10 @@ commands:
git checkout $branch
# Loop to prevent failure due to maven-ant-tasks not downloading a
jar..
for x in $(seq 1 3); do
- ${ANT_HOME}/bin/ant clean jar dtest-jar
+ ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar
dtest-jar
RETURN="$?"
if [ "${RETURN}" -eq "0" ]; then
+ cp build/dtest*.jar ~/dtest_jars
break
fi
done
@@ -341,14 +343,18 @@ commands:
# and build the dtest-jar for the branch under test
git checkout origin/$CIRCLE_BRANCH
for x in $(seq 1 3); do
- ${ANT_HOME}/bin/ant clean jar dtest-jar
+ ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
RETURN="$?"
if [ "${RETURN}" -eq "0" ]; then
+ cp build/dtest*.jar ~/dtest_jars
break
fi
done
- mkdir ~/dtest_jars
- cp build/dtest*.jar ~/dtest_jars
+ # Exit, if we didn't build successfully
+ if [ "${RETURN}" -ne "0" ]; then
+ echo "Build failed with exit code: ${RETURN}"
+ exit ${RETURN}
+ fi
ls -l ~/dtest_jars
no_output_timeout: 15m
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3c62b4a..f8526be 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -725,6 +725,7 @@ jobs:
command: |
export PATH=$JAVA_HOME/bin:$PATH
cd ~/cassandra
+ mkdir ~/dtest_jars
git remote add apache git://github.com/apache/cassandra.git
for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 trunk; do
# check out the correct cassandra version:
@@ -733,9 +734,10 @@ jobs:
git checkout $branch
# Loop to prevent failure due to maven-ant-tasks not downloading a
jar..
for x in $(seq 1 3); do
- ${ANT_HOME}/bin/ant clean jar dtest-jar
+ ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar
dtest-jar
RETURN="$?"
if [ "${RETURN}" -eq "0" ]; then
+ cp build/dtest*.jar ~/dtest_jars
break
fi
done
@@ -748,14 +750,18 @@ jobs:
# and build the dtest-jar for the branch under test
git checkout origin/$CIRCLE_BRANCH
for x in $(seq 1 3); do
- ${ANT_HOME}/bin/ant clean jar dtest-jar
+ ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
RETURN="$?"
if [ "${RETURN}" -eq "0" ]; then
+ cp build/dtest*.jar ~/dtest_jars
break
fi
done
- mkdir ~/dtest_jars
- cp build/dtest*.jar ~/dtest_jars
+ # Exit, if we didn't build successfully
+ if [ "${RETURN}" -ne "0" ]; then
+ echo "Build failed with exit code: ${RETURN}"
+ exit ${RETURN}
+ fi
ls -l ~/dtest_jars
no_output_timeout: 15m
- persist_to_workspace:
diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES
index 81802ad..2e40513 100644
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@ -725,6 +725,7 @@ jobs:
command: |
export PATH=$JAVA_HOME/bin:$PATH
cd ~/cassandra
+ mkdir ~/dtest_jars
git remote add apache git://github.com/apache/cassandra.git
for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 trunk; do
# check out the correct cassandra version:
@@ -733,9 +734,10 @@ jobs:
git checkout $branch
# Loop to prevent failure due to maven-ant-tasks not downloading a
jar..
for x in $(seq 1 3); do
- ${ANT_HOME}/bin/ant clean jar dtest-jar
+ ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar
dtest-jar
RETURN="$?"
if [ "${RETURN}" -eq "0" ]; then
+ cp build/dtest*.jar ~/dtest_jars
break
fi
done
@@ -748,14 +750,18 @@ jobs:
# and build the dtest-jar for the branch under test
git checkout origin/$CIRCLE_BRANCH
for x in $(seq 1 3); do
- ${ANT_HOME}/bin/ant clean jar dtest-jar
+ ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
RETURN="$?"
if [ "${RETURN}" -eq "0" ]; then
+ cp build/dtest*.jar ~/dtest_jars
break
fi
done
- mkdir ~/dtest_jars
- cp build/dtest*.jar ~/dtest_jars
+ # Exit, if we didn't build successfully
+ if [ "${RETURN}" -ne "0" ]; then
+ echo "Build failed with exit code: ${RETURN}"
+ exit ${RETURN}
+ fi
ls -l ~/dtest_jars
no_output_timeout: 15m
- persist_to_workspace:
diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES
index 3c62b4a..f8526be 100644
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@ -725,6 +725,7 @@ jobs:
command: |
export PATH=$JAVA_HOME/bin:$PATH
cd ~/cassandra
+ mkdir ~/dtest_jars
git remote add apache git://github.com/apache/cassandra.git
for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 trunk; do
# check out the correct cassandra version:
@@ -733,9 +734,10 @@ jobs:
git checkout $branch
# Loop to prevent failure due to maven-ant-tasks not downloading a
jar..
for x in $(seq 1 3); do
- ${ANT_HOME}/bin/ant clean jar dtest-jar
+ ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar
dtest-jar
RETURN="$?"
if [ "${RETURN}" -eq "0" ]; then
+ cp build/dtest*.jar ~/dtest_jars
break
fi
done
@@ -748,14 +750,18 @@ jobs:
# and build the dtest-jar for the branch under test
git checkout origin/$CIRCLE_BRANCH
for x in $(seq 1 3); do
- ${ANT_HOME}/bin/ant clean jar dtest-jar
+ ${ANT_HOME}/bin/ant realclean; ${ANT_HOME}/bin/ant jar dtest-jar
RETURN="$?"
if [ "${RETURN}" -eq "0" ]; then
+ cp build/dtest*.jar ~/dtest_jars
break
fi
done
- mkdir ~/dtest_jars
- cp build/dtest*.jar ~/dtest_jars
+ # Exit, if we didn't build successfully
+ if [ "${RETURN}" -ne "0" ]; then
+ echo "Build failed with exit code: ${RETURN}"
+ exit ${RETURN}
+ fi
ls -l ~/dtest_jars
no_output_timeout: 15m
- persist_to_workspace:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
