Add config.yml.MIDRES for older Cassandra versions

patch by Ekaterina Dimitrova; review by Andres de la Pena for CASSANDRA-16804
This commit is contained in:
Ekaterina Dimitrova 2021-07-16 10:50:10 -04:00
parent 87424dabd2
commit 6e0b084d65
4 changed files with 1728 additions and 3 deletions

View File

@ -0,0 +1,75 @@
diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml
index 03e4ae9e8f..cf2b758187 100644
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@ -93,24 +93,40 @@ j8_par_executor: &j8_par_executor
executor:
name: java8-executor
#exec_resource_class: xlarge
- parallelism: 4
+ exec_resource_class: medium
+ parallelism: 25
j8_small_par_executor: &j8_small_par_executor
executor:
name: java8-executor
#exec_resource_class: xlarge
- parallelism: 1
+ exec_resource_class: large
+ parallelism: 10
j8_medium_par_executor: &j8_medium_par_executor
executor:
name: java8-executor
#exec_resource_class: xlarge
- parallelism: 1
+ exec_resource_class: large
+ parallelism: 4
+
+j8_large_par_executor: &j8_large_par_executor
+ executor:
+ name: java8-executor
+ exec_resource_class: large
+ parallelism: 50
+
+j8_very_large_par_executor: &j8_very_large_par_executor
+ executor:
+ name: java8-executor
+ exec_resource_class: xlarge
+ parallelism: 100
j8_seq_executor: &j8_seq_executor
executor:
name: java8-executor
#exec_resource_class: xlarge
+ exec_resource_class: medium
parallelism: 1 # sequential, single container tests: no parallelism benefits
with_dtests_jobs: &with_dtest_jobs
@@ -308,7 +324,7 @@ jobs:
target: testclasslist-compression
j8_dtests-with-vnodes:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -322,7 +338,7 @@ jobs:
pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
j8_dtests-no-vnodes:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -336,7 +352,7 @@ jobs:
pytest_extra_args: '--skip-resource-intensive-tests'
j8_upgradetests-no-vnodes:
- <<: *j8_par_executor
+ <<: *j8_very_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra

1634
.circleci/config.yml.MIDRES Normal file

File diff suppressed because it is too large Load Diff

View File

@ -24,6 +24,12 @@ circleci config process $BASEDIR/config-2_1.yml > $BASEDIR/config.yml.LOWRES.tmp
cat $BASEDIR/license.yml $BASEDIR/config.yml.LOWRES.tmp > $BASEDIR/config.yml.LOWRES
rm $BASEDIR/config.yml.LOWRES.tmp
# 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.tmp
cat $BASEDIR/license.yml $BASEDIR/config.yml.MIDRES.tmp > $BASEDIR/config.yml.MIDRES
rm $BASEDIR/config-2_1.yml.MIDRES $BASEDIR/config.yml.MIDRES.tmp
# setup highres
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.tmp

View File

@ -26,14 +26,17 @@ between them by copying the correct file to config.yml and committing the result
`cp .circleci/config.yml.HIGHRES .circleci/config.yml`
config.yml.LOWRES is the default config. MIDRES and HIGHRES are custom configs for those who
have access to premium CircleCI resources.
Make sure you never edit the config.yml manually.
## Updating the config master
To update the config (other than just swapping high/low resources) you need to install
To update the config (other than just swapping high/mid/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
@ -53,4 +56,11 @@ HIGHRES files, read below for details how to do it manually;
1. remove the temporary patched HIGHRES file: `rm config-2_1.yml.HIGHRES`
1. add the Apache license header to the newly created HIGHRES file:
`cat license.yml config.yml.HIGHRES > config.yml.HIGHRES.new && mv config.yml.HIGHRES.new config.yml.HIGHRES`
1. repeat the last steps to generate the MIDRES file:
```
patch -o config-2_1.yml.MIDRES config-2_1.yml config-2_1.yml.mid_res.patch
circleci config process config-2_1.yml.MIDRES > config.yml.MIDRES
rm config-2_1.yml.MIDRES
cat license.yml config.yml.MIDRES > config.yml.MIDRES.new && mv config.yml.MIDRES.new config.yml.MIDRES
```