You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sp...@apache.org on 2018/10/15 07:51:52 UTC
[03/10] cassandra git commit: Use new docker image for CircleCI builds
Use new docker image for CircleCI builds
patch by Stefan Podkowinski; reviewed by Marcus Eriksson for CASSANDRA-14713
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dcd92a93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dcd92a93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dcd92a93
Branch: refs/heads/cassandra-3.11
Commit: dcd92a93ab12c08963bae8a83340bf7fdfe186dd
Parents: 62e48c5
Author: Stefan Podkowinski <st...@1und1.de>
Authored: Tue Oct 9 14:12:54 2018 +0200
Committer: Stefan Podkowinski <st...@1und1.de>
Committed: Tue Oct 9 14:12:54 2018 +0200
----------------------------------------------------------------------
.circleci/config.yml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcd92a93/.circleci/config.yml
----------------------------------------------------------------------
diff --git a/.circleci/config.yml b/.circleci/config.yml
index f881b70..c389cbc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,10 +1,10 @@
default_env_vars: &default_env_vars
- JAVA_HOME: /usr/local/openjdk8u154-cassandra-b02
- ANT_HOME: /usr/local/apache-ant-1.10.1
+ JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ ANT_HOME: /usr/share/ant
LANG: en_US.UTF-8
- JDK_HOME: /usr/local/openjdk8u154-cassandra-b02
- JAVA8_HOME: /usr/local/openjdk8u154-cassandra-b02
- JAVA7_HOME: /usr/local/openjdk7u82-cassandra-b02
+ JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
KEEP_TEST_DIR: true
DEFAULT_DIR: /home/cassandra/cassandra-dtest
PYTHONIOENCODING: utf-8
@@ -68,7 +68,7 @@ workflows:
build_and_run_tests: *default_jobs
#build_and_run_tests: *with_dtest_jobs_only
#build_and_run_tests: *with_dtest_jobs
-docker_image: &docker_image kjellman/cassandra-test:0.4.3
+docker_image: &docker_image spod/cassandra-testing-ubuntu18-java11
version: 2
jobs:
build:
@@ -211,7 +211,7 @@ jobs:
export PATH=$PATH:$ANT_HOME/bin:$JAVA_HOME/bin
export CASS_DRIVER_NO_EXTENSIONS=true
export CASS_DRIVER_NO_CYTHON=true
- pip3 install --exists-action w -r ~/cassandra-dtest/requirements.txt
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 freeze
- run:
name: Determine Tests to Run
@@ -289,7 +289,7 @@ jobs:
export PATH=$PATH:$ANT_HOME/bin:$JAVA_HOME/bin
export CASS_DRIVER_NO_EXTENSIONS=true
export CASS_DRIVER_NO_CYTHON=true
- pip3 install --exists-action w -r ~/cassandra-dtest/requirements.txt
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 freeze
- run:
name: Determine Tests to Run
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org