diff --git a/tests/integration-tests/Defaults.gitlab-ci.yml b/tests/integration-tests/Defaults.gitlab-ci.yml index 09762e0d0e81c605c21a819db2dff78494815e71..2c51ac10e9ddc19edc825cc2e78c1001f83b406b 100644 --- a/tests/integration-tests/Defaults.gitlab-ci.yml +++ b/tests/integration-tests/Defaults.gitlab-ci.yml @@ -7,29 +7,13 @@ include: opentofu_version: $OPENTOFU_VERSION root_dir: $TEST_TF_ROOT state_name: $TEST_TF_STATE_NAME + # Required to run everything immediately, instead of manually. + fmt_rules: [{when: always}] + validate_rules: [{when: always}] + test_rules: [{when: always}] + plan_rules: [{when: always}] + apply_rules: [{when: always}] + destroy_rules: [{when: always}] + delete_state_rules: [{when: always}] stages: [validate, test, build, deploy, cleanup] - -# Required to run everything immediately, instead of manually. - -fmt: - rules: [{when: always}] - -validate: - rules: [{when: always}] - -test: - rules: [{when: always}] - -plan: - rules: [{when: always}] - -apply: - rules: [{when: always}] - -destroy: - rules: [{when: always}] - -delete-state: - rules: [{when: always}] - diff --git a/tests/integration-tests/Destroy.gitlab-ci.yml b/tests/integration-tests/Destroy.gitlab-ci.yml index d0ec3c56ae349723dedf34cdfd13d4561621ec08..874168e8b3e24c256f1eaa70c1a982bc7b85bc7b 100644 --- a/tests/integration-tests/Destroy.gitlab-ci.yml +++ b/tests/integration-tests/Destroy.gitlab-ci.yml @@ -10,6 +10,8 @@ include: state_name: $TEST_TF_STATE_NAME no_plan: true auto_apply: true + # Required to run everything immediately, instead of manually. + rules: [{when: always}] - component: $CI_SERVER_FQDN/$CI_PROJECT_PATH/validate-plan-destroy@$CI_COMMIT_SHA inputs: @@ -18,26 +20,11 @@ include: opentofu_version: $OPENTOFU_VERSION root_dir: $TEST_TF_ROOT state_name: $TEST_TF_STATE_NAME + # Required to run everything immediately, instead of manually. + fmt_rules: [{when: always}] + validate_rules: [{when: always}] + plan_rules: [{when: always}] + destroy_rules: [{when: always}] + delete_state_rules: [{when: always}] stages: [setup, validate, build, cleanup] - -# Required to run everything immediately, instead of manually. - -'setup:apply': - rules: [{when: always}] - -fmt: - rules: [{when: always}] - -validate: - rules: [{when: always}] - -plan: - rules: [{when: always}] - -destroy: - rules: [{when: always}] - -delete-state: - rules: [{when: always}] - diff --git a/tests/integration-tests/TestJob.gitlab-ci.yml b/tests/integration-tests/TestJob.gitlab-ci.yml index adf8da87f9d9cb09ea32a1725c42763335cce558..96e90eecd7990cf5976bb604ddd2fa901961f60d 100644 --- a/tests/integration-tests/TestJob.gitlab-ci.yml +++ b/tests/integration-tests/TestJob.gitlab-ci.yml @@ -6,10 +6,7 @@ include: opentofu_version: $OPENTOFU_VERSION root_dir: $TEST_TF_ROOT state_name: $TEST_TF_STATE_NAME + # Required to run everything immediately, instead of manually. + rules: [{when: always}] stages: [test] - -# Required to run everything immediately, instead of manually. - -test: - rules: [{when: always}] diff --git a/tests/integration-tests/VarFile.gitlab-ci.yml b/tests/integration-tests/VarFile.gitlab-ci.yml index 0c035dae6f4d7ab226aa7453dbba4a6340da3927..f1505f31e66bcf391008879f7dfa3d19c9522c8f 100644 --- a/tests/integration-tests/VarFile.gitlab-ci.yml +++ b/tests/integration-tests/VarFile.gitlab-ci.yml @@ -8,29 +8,13 @@ include: root_dir: $TEST_TF_ROOT state_name: $TEST_TF_STATE_NAME var_file: varfile.integration-test.tfvars + # Required to run everything immediately, instead of manually. + fmt_rules: [{when: always}] + validate_rules: [{when: always}] + test_rules: [{when: always}] + plan_rules: [{when: always}] + apply_rules: [{when: always}] + destroy_rules: [{when: always}] + delete_state_rules: [{when: always}] stages: [validate, test, build, deploy, cleanup] - -# Required to run everything immediately, instead of manually. - -fmt: - rules: [{when: always}] - -validate: - rules: [{when: always}] - -test: - rules: [{when: always}] - -plan: - rules: [{when: always}] - -apply: - rules: [{when: always}] - -destroy: - rules: [{when: always}] - -delete-state: - rules: [{when: always}] -