This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new b619d21 Circle CI approval jobs should not require build to run first
b619d21 is described below
commit b619d21ed2b0de72da11daad7ce3938a6b348dd4
Author: David Capwell <[email protected]>
AuthorDate: Thu Jul 23 17:41:20 2020 -0700
Circle CI approval jobs should not require build to run first
patch by David Capwell; reviewed by Ekaterina Dimitrova for CASSANDRA-15966
---
.circleci/config-2_1.yml | 63 ++++++++++++++++++++++----------------------
.circleci/config.yml | 63 ++++++++++++++++++++++----------------------
.circleci/config.yml.HIGHRES | 63 ++++++++++++++++++++++----------------------
.circleci/config.yml.LOWRES | 63 ++++++++++++++++++++++----------------------
.circleci/config.yml.MIDRES | 63 ++++++++++++++++++++++----------------------
.circleci/generate.sh | 7 +++++
.circleci/generate_midres.sh | 8 ------
.circleci/readme.md | 4 +--
8 files changed, 164 insertions(+), 170 deletions(-)
diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml
index ab62124..68b83b7 100644
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@ -65,40 +65,35 @@ j8_with_dtests_jobs: &j8_with_dtests_jobs
# Java 11 unit tests (on request, currently not working)
- start_j11_unit_tests:
type: approval
- requires:
- - j8_build
- j11_unit_tests:
requires:
- start_j11_unit_tests
+ - j8_build
# specialized unit tests (all run on request using Java 8)
- start_utests_long:
type: approval
- requires:
- - j8_build
- utests_long:
requires:
- start_utests_long
+ - j8_build
- start_utests_compression:
type: approval
- requires:
- - j8_build
- utests_compression:
requires:
- start_utests_compression
+ - j8_build
- start_utests_stress:
type: approval
- requires:
- - j8_build
- utests_stress:
requires:
- start_utests_stress
+ - j8_build
- start_utests_fqltool:
type: approval
- requires:
- - j8_build
- utests_fqltool:
requires:
- start_utests_fqltool
+ - j8_build
- start_jvm_upgrade_dtest:
type: approval
- j8_dtest_jars_build:
@@ -111,85 +106,88 @@ j8_with_dtests_jobs: &j8_with_dtests_jobs
# Java 8 dtests (on request)
- start_j8_dtests:
type: approval
- requires:
- - j8_build
- j8_dtests-with-vnodes:
requires:
- start_j8_dtests
+ - j8_build
- j8_dtests-no-vnodes:
requires:
- start_j8_dtests
+ - j8_build
# Java 11 dtests (on request)
- start_j11_dtests:
type: approval
- requires:
- - j8_build
- j11_dtests-with-vnodes:
requires:
- start_j11_dtests
+ - j8_build
- j11_dtests-no-vnodes:
requires:
- start_j11_dtests
+ - j8_build
# Java 8 upgrade tests
- start_upgrade_tests:
type: approval
- requires:
- - j8_build
- j8_upgradetests-no-vnodes:
requires:
- start_upgrade_tests
+ - j8_build
- start_j8_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j8_build
- j8_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- j8_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- j8_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- start_j8_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j8_build
- j8_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- j8_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- j8_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- start_j11_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j8_build
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- j11_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- start_j11_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j8_build
- j11_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
- j11_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
j11_with_dtests_jobs: &j11_with_dtests_jobs
jobs:
@@ -197,51 +195,52 @@ j11_with_dtests_jobs: &j11_with_dtests_jobs
# Java 11 unit tests (on request, currently not working)
- start_j11_unit_tests:
type: approval
- requires:
- - j11_build
- j11_unit_tests:
requires:
- start_j11_unit_tests
+ - j11_build
- j11_jvm_dtests:
requires:
- j11_build
# Java 11 dtests (on request)
- start_j11_dtests:
type: approval
- requires:
- - j11_build
- j11_dtests-with-vnodes:
requires:
- start_j11_dtests
+ - j11_build
- j11_dtests-no-vnodes:
requires:
- start_j11_dtests
+ - j11_build
- start_j11_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j11_build
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- j11_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- start_j11_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j11_build
- j11_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
- j11_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
j8_with_dtest_jobs_only: &j8_with_dtest_jobs_only
jobs:
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ffcb107..f644066 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2232,39 +2232,34 @@ workflows:
- j8_build
- start_j11_unit_tests:
type: approval
- requires:
- - j8_build
- j11_unit_tests:
requires:
- start_j11_unit_tests
+ - j8_build
- start_utests_long:
type: approval
- requires:
- - j8_build
- utests_long:
requires:
- start_utests_long
+ - j8_build
- start_utests_compression:
type: approval
- requires:
- - j8_build
- utests_compression:
requires:
- start_utests_compression
+ - j8_build
- start_utests_stress:
type: approval
- requires:
- - j8_build
- utests_stress:
requires:
- start_utests_stress
+ - j8_build
- start_utests_fqltool:
type: approval
- requires:
- - j8_build
- utests_fqltool:
requires:
- start_utests_fqltool
+ - j8_build
- start_jvm_upgrade_dtest:
type: approval
- j8_dtest_jars_build:
@@ -2276,129 +2271,133 @@ workflows:
- j8_dtest_jars_build
- start_j8_dtests:
type: approval
- requires:
- - j8_build
- j8_dtests-with-vnodes:
requires:
- start_j8_dtests
+ - j8_build
- j8_dtests-no-vnodes:
requires:
- start_j8_dtests
+ - j8_build
- start_j11_dtests:
type: approval
- requires:
- - j8_build
- j11_dtests-with-vnodes:
requires:
- start_j11_dtests
+ - j8_build
- j11_dtests-no-vnodes:
requires:
- start_j11_dtests
+ - j8_build
- start_upgrade_tests:
type: approval
- requires:
- - j8_build
- j8_upgradetests-no-vnodes:
requires:
- start_upgrade_tests
+ - j8_build
- start_j8_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j8_build
- j8_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- j8_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- j8_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- start_j8_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j8_build
- j8_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- j8_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- j8_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- start_j11_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j8_build
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- j11_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- start_j11_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j8_build
- j11_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
- j11_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
java11_build_and_run_tests:
jobs:
- j11_build
- start_j11_unit_tests:
type: approval
- requires:
- - j11_build
- j11_unit_tests:
requires:
- start_j11_unit_tests
+ - j11_build
- j11_jvm_dtests:
requires:
- j11_build
- start_j11_dtests:
type: approval
- requires:
- - j11_build
- j11_dtests-with-vnodes:
requires:
- start_j11_dtests
+ - j11_build
- j11_dtests-no-vnodes:
requires:
- start_j11_dtests
+ - j11_build
- start_j11_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j11_build
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- j11_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- start_j11_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j11_build
- j11_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
- j11_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES
index 51b02cc..43a0238 100644
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@ -2232,39 +2232,34 @@ workflows:
- j8_build
- start_j11_unit_tests:
type: approval
- requires:
- - j8_build
- j11_unit_tests:
requires:
- start_j11_unit_tests
+ - j8_build
- start_utests_long:
type: approval
- requires:
- - j8_build
- utests_long:
requires:
- start_utests_long
+ - j8_build
- start_utests_compression:
type: approval
- requires:
- - j8_build
- utests_compression:
requires:
- start_utests_compression
+ - j8_build
- start_utests_stress:
type: approval
- requires:
- - j8_build
- utests_stress:
requires:
- start_utests_stress
+ - j8_build
- start_utests_fqltool:
type: approval
- requires:
- - j8_build
- utests_fqltool:
requires:
- start_utests_fqltool
+ - j8_build
- start_jvm_upgrade_dtest:
type: approval
- j8_dtest_jars_build:
@@ -2276,129 +2271,133 @@ workflows:
- j8_dtest_jars_build
- start_j8_dtests:
type: approval
- requires:
- - j8_build
- j8_dtests-with-vnodes:
requires:
- start_j8_dtests
+ - j8_build
- j8_dtests-no-vnodes:
requires:
- start_j8_dtests
+ - j8_build
- start_j11_dtests:
type: approval
- requires:
- - j8_build
- j11_dtests-with-vnodes:
requires:
- start_j11_dtests
+ - j8_build
- j11_dtests-no-vnodes:
requires:
- start_j11_dtests
+ - j8_build
- start_upgrade_tests:
type: approval
- requires:
- - j8_build
- j8_upgradetests-no-vnodes:
requires:
- start_upgrade_tests
+ - j8_build
- start_j8_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j8_build
- j8_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- j8_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- j8_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- start_j8_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j8_build
- j8_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- j8_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- j8_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- start_j11_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j8_build
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- j11_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- start_j11_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j8_build
- j11_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
- j11_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
java11_build_and_run_tests:
jobs:
- j11_build
- start_j11_unit_tests:
type: approval
- requires:
- - j11_build
- j11_unit_tests:
requires:
- start_j11_unit_tests
+ - j11_build
- j11_jvm_dtests:
requires:
- j11_build
- start_j11_dtests:
type: approval
- requires:
- - j11_build
- j11_dtests-with-vnodes:
requires:
- start_j11_dtests
+ - j11_build
- j11_dtests-no-vnodes:
requires:
- start_j11_dtests
+ - j11_build
- start_j11_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j11_build
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- j11_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- start_j11_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j11_build
- j11_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
- j11_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES
index ffcb107..f644066 100644
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@ -2232,39 +2232,34 @@ workflows:
- j8_build
- start_j11_unit_tests:
type: approval
- requires:
- - j8_build
- j11_unit_tests:
requires:
- start_j11_unit_tests
+ - j8_build
- start_utests_long:
type: approval
- requires:
- - j8_build
- utests_long:
requires:
- start_utests_long
+ - j8_build
- start_utests_compression:
type: approval
- requires:
- - j8_build
- utests_compression:
requires:
- start_utests_compression
+ - j8_build
- start_utests_stress:
type: approval
- requires:
- - j8_build
- utests_stress:
requires:
- start_utests_stress
+ - j8_build
- start_utests_fqltool:
type: approval
- requires:
- - j8_build
- utests_fqltool:
requires:
- start_utests_fqltool
+ - j8_build
- start_jvm_upgrade_dtest:
type: approval
- j8_dtest_jars_build:
@@ -2276,129 +2271,133 @@ workflows:
- j8_dtest_jars_build
- start_j8_dtests:
type: approval
- requires:
- - j8_build
- j8_dtests-with-vnodes:
requires:
- start_j8_dtests
+ - j8_build
- j8_dtests-no-vnodes:
requires:
- start_j8_dtests
+ - j8_build
- start_j11_dtests:
type: approval
- requires:
- - j8_build
- j11_dtests-with-vnodes:
requires:
- start_j11_dtests
+ - j8_build
- j11_dtests-no-vnodes:
requires:
- start_j11_dtests
+ - j8_build
- start_upgrade_tests:
type: approval
- requires:
- - j8_build
- j8_upgradetests-no-vnodes:
requires:
- start_upgrade_tests
+ - j8_build
- start_j8_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j8_build
- j8_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- j8_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- j8_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- start_j8_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j8_build
- j8_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- j8_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- j8_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- start_j11_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j8_build
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- j11_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- start_j11_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j8_build
- j11_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
- j11_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
java11_build_and_run_tests:
jobs:
- j11_build
- start_j11_unit_tests:
type: approval
- requires:
- - j11_build
- j11_unit_tests:
requires:
- start_j11_unit_tests
+ - j11_build
- j11_jvm_dtests:
requires:
- j11_build
- start_j11_dtests:
type: approval
- requires:
- - j11_build
- j11_dtests-with-vnodes:
requires:
- start_j11_dtests
+ - j11_build
- j11_dtests-no-vnodes:
requires:
- start_j11_dtests
+ - j11_build
- start_j11_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j11_build
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- j11_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- start_j11_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j11_build
- j11_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
- j11_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
diff --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES
index 8eca9ef..f1e3c8c 100644
--- a/.circleci/config.yml.MIDRES
+++ b/.circleci/config.yml.MIDRES
@@ -2232,39 +2232,34 @@ workflows:
- j8_build
- start_j11_unit_tests:
type: approval
- requires:
- - j8_build
- j11_unit_tests:
requires:
- start_j11_unit_tests
+ - j8_build
- start_utests_long:
type: approval
- requires:
- - j8_build
- utests_long:
requires:
- start_utests_long
+ - j8_build
- start_utests_compression:
type: approval
- requires:
- - j8_build
- utests_compression:
requires:
- start_utests_compression
+ - j8_build
- start_utests_stress:
type: approval
- requires:
- - j8_build
- utests_stress:
requires:
- start_utests_stress
+ - j8_build
- start_utests_fqltool:
type: approval
- requires:
- - j8_build
- utests_fqltool:
requires:
- start_utests_fqltool
+ - j8_build
- start_jvm_upgrade_dtest:
type: approval
- j8_dtest_jars_build:
@@ -2276,129 +2271,133 @@ workflows:
- j8_dtest_jars_build
- start_j8_dtests:
type: approval
- requires:
- - j8_build
- j8_dtests-with-vnodes:
requires:
- start_j8_dtests
+ - j8_build
- j8_dtests-no-vnodes:
requires:
- start_j8_dtests
+ - j8_build
- start_j11_dtests:
type: approval
- requires:
- - j8_build
- j11_dtests-with-vnodes:
requires:
- start_j11_dtests
+ - j8_build
- j11_dtests-no-vnodes:
requires:
- start_j11_dtests
+ - j8_build
- start_upgrade_tests:
type: approval
- requires:
- - j8_build
- j8_upgradetests-no-vnodes:
requires:
- start_upgrade_tests
+ - j8_build
- start_j8_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j8_build
- j8_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- j8_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- j8_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_build
- start_j8_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j8_build
- j8_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- j8_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- j8_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_build
- start_j11_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j8_build
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- j11_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j8_build
- start_j11_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j8_build
- j11_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
- j11_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j8_build
java11_build_and_run_tests:
jobs:
- j11_build
- start_j11_unit_tests:
type: approval
- requires:
- - j11_build
- j11_unit_tests:
requires:
- start_j11_unit_tests
+ - j11_build
- j11_jvm_dtests:
requires:
- j11_build
- start_j11_dtests:
type: approval
- requires:
- - j11_build
- j11_dtests-with-vnodes:
requires:
- start_j11_dtests
+ - j11_build
- j11_dtests-no-vnodes:
requires:
- start_j11_dtests
+ - j11_build
- start_j11_cqlsh_tests-with-vnodes:
type: approval
- requires:
- - j11_build
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- j11_cqlsh-dtests-py38-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_build
- start_j11_cqlsh_tests-no-vnodes:
type: approval
- requires:
- - j11_build
- j11_cqlsh-dtests-py2-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
- j11_cqlsh-dtests-py38-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_build
diff --git a/.circleci/generate.sh b/.circleci/generate.sh
index f0944a6..5856a0f 100755
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@ -3,6 +3,13 @@
BASEDIR=`dirname $0`
circleci config process $BASEDIR/config-2_1.yml > $BASEDIR/config.yml.LOWRES
+
+# setup midres
+patch -o $BASEDIR/config-2_1.yml.MIDRES $BASEDIR/config-2_1.yml
$BASEDIR/config-2_1.yml.mid_res.patch
+circleci config process $BASEDIR/config-2_1.yml.MIDRES >
$BASEDIR/config.yml.MIDRES
+rm $BASEDIR/config-2_1.yml.MIDRES
+
+# setup higher
patch -o $BASEDIR/config-2_1.yml.HIGHRES $BASEDIR/config-2_1.yml
$BASEDIR/config-2_1.yml.high_res.patch
circleci config process $BASEDIR/config-2_1.yml.HIGHRES >
$BASEDIR/config.yml.HIGHRES
rm $BASEDIR/config-2_1.yml.HIGHRES
diff --git a/.circleci/generate_midres.sh b/.circleci/generate_midres.sh
deleted file mode 100755
index d2e179e..0000000
--- a/.circleci/generate_midres.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-BASEDIR=`dirname $0`
-
-circleci config process $BASEDIR/config-2_1.yml > $BASEDIR/config.yml.LOWRES
-patch -o $BASEDIR/config-2_1.yml.MIDRES $BASEDIR/config-2_1.yml
$BASEDIR/config-2_1.yml.mid_res.patch
-circleci config process $BASEDIR/config-2_1.yml.MIDRES >
$BASEDIR/config.yml.MIDRES
-rm $BASEDIR/config-2_1.yml.MIDRES
diff --git a/.circleci/readme.md b/.circleci/readme.md
index 6c23d93..29fbd08 100644
--- a/.circleci/readme.md
+++ b/.circleci/readme.md
@@ -15,8 +15,8 @@ Make sure you never edit the config.yml manually.
To update the config (other than just swapping high/low resources) you need to
install
the [CircleCI CLI](https://circleci.com/docs/2.0/local-cli/#install).
-The directory contains `config-2_1.yml` which is then converted to the actual
HIGH/LOW
-resource files. There is a script called `generate.sh` which creates the
LOWRES and
+The directory contains `config-2_1.yml` which is then converted to the actual
HIGH/MID/LOW
+resource files. There is a script called `generate.sh` which creates the
LOWRES, MIDRES, and
HIGHRES files, read below for details how to do it manually;
1. make your edits to config-2_1.yml - let it stay at lowres settings
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
