adelapena commented on code in PR #2163: URL: https://github.com/apache/cassandra/pull/2163#discussion_r1110191209
########## .circleci/generate.sh: ########## @@ -145,52 +141,38 @@ if $has_env_vars && $check_env_vars; then done fi -if $lowres; then - ($all || $midres || $highres) && die "Cannot use option -l with options -a, -m or -h" - echo "Generating new config.yml file with low resources from config-2_1.yml" - 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 - rm $BASEDIR/config.yml.LOWRES.tmp - -elif $midres; then - ($all || $lowres || $highres) && die "Cannot use option -m with options -a, -l or -h" - echo "Generating new config.yml file with middle resources from config-2_1.yml" - 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 - rm $BASEDIR/config-2_1.yml.MIDRES $BASEDIR/config.yml.MIDRES.tmp +if $free; then + ($all || $paid) && die "Cannot use option -f with options -a or -p" + echo "Generating new config.yml file for free tier from config-2_1.yml" + circleci config process $BASEDIR/config-2_1.yml > $BASEDIR/config.yml.FREE.tmp + cat $BASEDIR/license.yml $BASEDIR/config.yml.FREE.tmp > $BASEDIR/config.yml + rm $BASEDIR/config.yml.FREE.tmp -elif $highres; then - ($all || $lowres || $midres) && die "Cannot use option -h with options -a, -l or -m" - echo "Generating new config.yml file with high resources from config-2_1.yml" - 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 - cat $BASEDIR/license.yml $BASEDIR/config.yml.HIGHRES.tmp > $BASEDIR/config.yml - rm $BASEDIR/config-2_1.yml.HIGHRES $BASEDIR/config.yml.HIGHRES.tmp +elif $paid; then + ($all || $free) && die "Cannot use option -p with options -a or -f" + echo "Generating new config.yml file for paid tier from config-2_1.yml" + patch -o $BASEDIR/config-2_1.yml.PAID $BASEDIR/config-2_1.yml $BASEDIR/config-2_1.yml.PAID.patch + circleci config process $BASEDIR/config-2_1.yml.PAID > $BASEDIR/config.yml.PAID.tmp + cat $BASEDIR/license.yml $BASEDIR/config.yml.PAID.tmp > $BASEDIR/config.yml + rm $BASEDIR/config-2_1.yml.PAID $BASEDIR/config.yml.PAID.tmp elif $all; then - ($lowres || $midres || $highres || $has_env_vars) && die "Cannot use option -a with options -l, -m, -h or -e" - echo "Generating new config.yml file with low resources and LOWRES/MIDRES/HIGHRES templates from config-2_1.yml" - - # setup lowres - 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 + ($free || $paid || $has_env_vars) && die "Cannot use option -a with options -f, -p or -e" + echo "Generating new default config.yml file for free tier and FREE/PAID templates from config-2_1.yml" Review Comment: Added a line about that. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
