You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pr@cassandra.apache.org by GitBox <gi...@apache.org> on 2021/04/08 10:19:13 UTC
[GitHub] [cassandra-builds] michaelsembwever opened a new pull request #42: Fix JDK11 test runs inside docker
michaelsembwever opened a new pull request #42:
URL: https://github.com/apache/cassandra-builds/pull/42
Previously cassandra-test.sh depended on the jenkins JAVA_HOME having been configured for different JDK matrix axes. It is now passed through cassandra-test-docker.sh
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] [cassandra-builds] michaelsembwever closed pull request #42: Fix JDK11 test runs inside docker
Posted by GitBox <gi...@apache.org>.
michaelsembwever closed pull request #42:
URL: https://github.com/apache/cassandra-builds/pull/42
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] [cassandra-builds] tlasica commented on a change in pull request #42: Fix JDK11 test runs inside docker
Posted by GitBox <gi...@apache.org>.
tlasica commented on a change in pull request #42:
URL: https://github.com/apache/cassandra-builds/pull/42#discussion_r610001539
##########
File path: build-scripts/cassandra-test-docker.sh
##########
@@ -33,9 +40,23 @@ else
DOCKER_IMAGE=$5
TARGET=$6
SPLIT_CHUNK=$7
+
+ # Setup JDK
+ java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F. '{print $1}')
+ if [ "$java_version" -ge 11 ]; then
+ java_version="11"
+ if ! grep -q CASSANDRA_USE_JDK11 build.xml ; then
+ echo "Skipping build. JDK11 not supported against $(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')"
+ exit 0
+ fi
+ else
+ java_version="8"
+ fi
+
cat > env.list <<EOF
REPO=$1
BRANCH=$2
+JAVA_VERSION=${java_version}
Review comment:
will `java_version` be always defined at this point?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] [cassandra-builds] tlasica commented on a change in pull request #42: Fix JDK11 test runs inside docker
Posted by GitBox <gi...@apache.org>.
tlasica commented on a change in pull request #42:
URL: https://github.com/apache/cassandra-builds/pull/42#discussion_r610035195
##########
File path: build-scripts/cassandra-test-docker.sh
##########
@@ -33,9 +40,23 @@ else
DOCKER_IMAGE=$5
TARGET=$6
SPLIT_CHUNK=$7
+
+ # Setup JDK
+ java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F. '{print $1}')
+ if [ "$java_version" -ge 11 ]; then
+ java_version="11"
+ if ! grep -q CASSANDRA_USE_JDK11 build.xml ; then
+ echo "Skipping build. JDK11 not supported against $(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')"
+ exit 0
+ fi
+ else
+ java_version="8"
+ fi
+
cat > env.list <<EOF
REPO=$1
BRANCH=$2
+JAVA_VERSION=${java_version}
Review comment:
yeah, indentation for `cat` fooled me.. :facepalm:
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] [cassandra-builds] michaelsembwever commented on a change in pull request #42: Fix JDK11 test runs inside docker
Posted by GitBox <gi...@apache.org>.
michaelsembwever commented on a change in pull request #42:
URL: https://github.com/apache/cassandra-builds/pull/42#discussion_r610004413
##########
File path: build-scripts/cassandra-test-docker.sh
##########
@@ -33,9 +40,23 @@ else
DOCKER_IMAGE=$5
TARGET=$6
SPLIT_CHUNK=$7
+
+ # Setup JDK
+ java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F. '{print $1}')
+ if [ "$java_version" -ge 11 ]; then
+ java_version="11"
+ if ! grep -q CASSANDRA_USE_JDK11 build.xml ; then
+ echo "Skipping build. JDK11 not supported against $(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')"
+ exit 0
+ fi
+ else
+ java_version="8"
+ fi
+
cat > env.list <<EOF
REPO=$1
BRANCH=$2
+JAVA_VERSION=${java_version}
Review comment:
yes. it has to be `11` (line 47) or `8` (line 53).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org
[GitHub] [cassandra-builds] michaelsembwever commented on pull request #42: Fix JDK11 test runs inside docker
Posted by GitBox <gi...@apache.org>.
michaelsembwever commented on pull request #42:
URL: https://github.com/apache/cassandra-builds/pull/42#issuecomment-819292782
merged manually with https://github.com/apache/cassandra-builds/commit/1a52d5ba1992a8726efa5cdc1797deb440796c3f
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org