fix: bail if --chaos and specific version
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
See coop-cloud/organising#503.
This commit is contained in:
parent
3e511446aa
commit
85b90ef80c
|
@ -51,6 +51,11 @@ recipes.
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
stackName := app.StackName()
|
stackName := app.StackName()
|
||||||
|
|
||||||
|
specificVersion := c.Args().Get(1)
|
||||||
|
if specificVersion != "" && internal.Chaos {
|
||||||
|
logrus.Fatal("cannot use <version> and --chaos together")
|
||||||
|
}
|
||||||
|
|
||||||
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -112,7 +117,6 @@ recipes.
|
||||||
}
|
}
|
||||||
|
|
||||||
version := deployedVersion
|
version := deployedVersion
|
||||||
specificVersion := c.Args().Get(1)
|
|
||||||
if specificVersion != "" {
|
if specificVersion != "" {
|
||||||
version = specificVersion
|
version = specificVersion
|
||||||
logrus.Debugf("choosing %s as version to deploy", version)
|
logrus.Debugf("choosing %s as version to deploy", version)
|
||||||
|
|
|
@ -51,6 +51,11 @@ recipes.
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
stackName := app.StackName()
|
stackName := app.StackName()
|
||||||
|
|
||||||
|
specificVersion := c.Args().Get(1)
|
||||||
|
if specificVersion != "" && internal.Chaos {
|
||||||
|
logrus.Fatal("cannot use <version> and --chaos together")
|
||||||
|
}
|
||||||
|
|
||||||
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -125,7 +130,6 @@ recipes.
|
||||||
logrus.Warnf("failed to determine deployed version of %s", app.Name)
|
logrus.Warnf("failed to determine deployed version of %s", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
specificVersion := c.Args().Get(1)
|
|
||||||
if specificVersion != "" {
|
if specificVersion != "" {
|
||||||
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -56,6 +56,11 @@ recipes.
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
stackName := app.StackName()
|
stackName := app.StackName()
|
||||||
|
|
||||||
|
specificVersion := c.Args().Get(1)
|
||||||
|
if specificVersion != "" && internal.Chaos {
|
||||||
|
logrus.Fatal("cannot use <version> and --chaos together")
|
||||||
|
}
|
||||||
|
|
||||||
if !internal.Chaos {
|
if !internal.Chaos {
|
||||||
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
if err := recipe.EnsureIsClean(app.Recipe); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -126,7 +131,6 @@ recipes.
|
||||||
logrus.Warnf("failed to determine deployed version of %s", app.Name)
|
logrus.Warnf("failed to determine deployed version of %s", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
specificVersion := c.Args().Get(1)
|
|
||||||
if specificVersion != "" {
|
if specificVersion != "" {
|
||||||
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -312,6 +312,13 @@ teardown(){
|
||||||
_undeploy_app
|
_undeploy_app
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "bail out if specific version and chaos" {
|
||||||
|
run $ABRA app deploy "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
|
||||||
|
--chaos --no-input --no-converge-checks
|
||||||
|
assert_failure
|
||||||
|
assert_output --partial 'cannot use'
|
||||||
|
}
|
||||||
|
|
||||||
# bats test_tags=slow
|
# bats test_tags=slow
|
||||||
@test "COMPOSE_FILE with \$COMPOSE_FILE override works" {
|
@test "COMPOSE_FILE with \$COMPOSE_FILE override works" {
|
||||||
run sed -i 's/#COMPOSE_FILE="$COMPOSE_FILE:compose.extra_env.yml"/COMPOSE_FILE="$COMPOSE_FILE:compose.extra_env.yml"/g' \
|
run sed -i 's/#COMPOSE_FILE="$COMPOSE_FILE:compose.extra_env.yml"/COMPOSE_FILE="$COMPOSE_FILE:compose.extra_env.yml"/g' \
|
||||||
|
|
|
@ -194,6 +194,13 @@ teardown(){
|
||||||
_undeploy_app
|
_undeploy_app
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "bail out if specific version and chaos" {
|
||||||
|
run $ABRA app rollback "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
|
||||||
|
--chaos --no-input --no-converge-checks
|
||||||
|
assert_failure
|
||||||
|
assert_output --partial 'cannot use'
|
||||||
|
}
|
||||||
|
|
||||||
# bats test_tags=slow
|
# bats test_tags=slow
|
||||||
@test "rollback to previous version" {
|
@test "rollback to previous version" {
|
||||||
run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.1+1.20.2" --no-input --no-converge-checks
|
run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.1+1.20.2" --no-input --no-converge-checks
|
||||||
|
|
|
@ -47,6 +47,13 @@ teardown(){
|
||||||
_undeploy_app
|
_undeploy_app
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "bail out if specific version and chaos" {
|
||||||
|
run $ABRA app upgrade "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
|
||||||
|
--chaos --no-input --no-converge-checks
|
||||||
|
assert_failure
|
||||||
|
assert_output --partial 'cannot use'
|
||||||
|
}
|
||||||
|
|
||||||
# bats test_tags=slow
|
# bats test_tags=slow
|
||||||
@test "no upgrade if lint error" {
|
@test "no upgrade if lint error" {
|
||||||
_deploy_app
|
_deploy_app
|
||||||
|
|
Loading…
Reference in New Issue