You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2021/09/28 16:52:43 UTC
[cassandra] branch cassandra-4.0 updated (984f763 -> d32253d)
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 984f763 Merge branch cassandra-3.11 into cassandra-4.0
new b6678a0 Add option for environment variables to CircleCI config generation script
new dbe84e5 Merge branch 'cassandra-3.0' into cassandra-3.11
new d32253d Merge branch 'cassandra-3.11' into cassandra-4.0
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.circleci/config-2_1.yml | 8 ++++
.circleci/generate.sh | 109 +++++++++++++++++++++++++++++++++++++++++------
.circleci/readme.md | 30 +++++++++++++
3 files changed, 135 insertions(+), 12 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d32253d1aedd243c69503da4e6477b778f4dee65
Merge: 984f763 dbe84e5
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Tue Sep 28 17:50:07 2021 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
# Conflicts:
# .circleci/config-2_1.yml
.circleci/config-2_1.yml | 8 ++++
.circleci/generate.sh | 109 +++++++++++++++++++++++++++++++++++++++++------
.circleci/readme.md | 30 +++++++++++++
3 files changed, 135 insertions(+), 12 deletions(-)
diff --cc .circleci/config-2_1.yml
index 8d6656b,2fcfc09..c3f583e
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@@ -19,9 -19,16 +19,17 @@@
version: 2.1
default_env_vars: &default_env_vars
+
+ # The values of some of these environment variables are meant to be frequently changed by developers.
+ # The generate.sh script contains a list of accepted environment variables that should contain some of
+ # these variables. Also, some variables are mentioned in the documentation, at least in
+ # .circleci/readme.md and in doc/source/development/testing.rst.
+ # If you modify these variables, or if you add new variables whose values are meant to be changed frequently,
+ # please remember to modify the generate.sh script and the documentation accordingly.
+
- JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
ANT_HOME: /usr/share/ant
+ JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
LANG: en_US.UTF-8
KEEP_TEST_DIR: true
DEFAULT_DIR: /home/cassandra/cassandra-dtest
diff --cc .circleci/generate.sh
index 3b5ea50,f9d5ddf..838f769
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@@ -92,6 -162,22 +162,21 @@@ elif $all; the
# copy lower into config.yml to make sure this gets updated
cp $BASEDIR/config.yml.LOWRES $BASEDIR/config.yml
+
+ elif (!($has_env_vars)); then
+ print_help
fi
+ # replace environment variables
+ if $has_env_vars; then
+ IFS='='
+ echo "$env_vars" | tr '|' '\n' | while read entry; do
+ set -- $entry
+ key=$1
+ val=$2
+ echo "Setting environment variable $key: $val"
+ sed -i.bak "s|- $key:.*|- $key: $val|" $BASEDIR/config.yml
+ done
+ unset IFS
+ fi
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org