diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ddb8e76c0ed85e06f9a30db4b46b0d02525e5dc3..924ee46468fc88b3d8469b94750128be503478db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,6 +52,7 @@ stages: .opentofu-versions: parallel: matrix: + - OPENTOFU_VERSION: '1.7.0' - OPENTOFU_VERSION: '1.7.0-alpha1' - OPENTOFU_VERSION: '1.6.2' - OPENTOFU_VERSION: '1.6.1' @@ -62,7 +63,7 @@ variables: DOCKER_DIND_IMAGE: "docker:26.1.0-dind" # OpenTofu variables - LATEST_OPENTOFU_VERSION: '1.6.2' + LATEST_OPENTOFU_VERSION: '1.7.0' # OpenTofu image build variables: PLATFORMS: linux/amd64,linux/arm64 diff --git a/README.md b/README.md index 4dff8c71cef993b86a4637b180094cc9f9142277..575e4252818fb7f3fa99fd134efae149c82918d9 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,7 @@ Have a look at the individual template spec to learn about the available inputs. | `stage_deploy` | `deploy` | Defines the deploy stage. This stage includes the `apply` job. | | `stage_cleanup` | `cleanup` | Defines the cleanup stage. This stage includes the `destroy` and `delete-state` jobs. | | `version` | `latest` | Version of this component. Has to be the same as the one in the component include entry. | -| `opentofu_version` | `1.6.2` | OpenTofu version that should be used. Must be one of `1.7.0-alpha1`, `1.6.2`, `1.6.1`, `1.6.0`. | +| `opentofu_version` | `1.7.0` | OpenTofu version that should be used. Must be one of `1.7.0`, `1.7.0-alpha1`, `1.6.2`, `1.6.1`, `1.6.0`. | | `image_registry_base` | `$CI_REGISTRY/components/opentofu` | Host URI to the job images. Will be combined with `image_name` to construct the actual image URI. | | `image_name` | `gitlab-opentofu` | Image name for the job images. Hosted under `image_registry_base`. | | `root_dir` | `${CI_PROJECT_DIR}` | Root directory for the OpenTofu project. | @@ -194,6 +194,7 @@ Have a look at the individual template spec to learn about the available inputs. The following OpenTofu versions are available with this component via the `opentofu_version` input: +- [`1.7.0`](https://github.com/opentofu/opentofu/releases/tag/v1.7.0) - [`1.7.0-alpha1`](https://github.com/opentofu/opentofu/releases/tag/v1.7.0-alpha1) - [`1.6.2`](https://github.com/opentofu/opentofu/releases/tag/v1.6.2) - [`1.6.1`](https://github.com/opentofu/opentofu/releases/tag/v1.6.1) diff --git a/templates/apply.yml b/templates/apply.yml index 05a64479ca6e70b4a7c3587e249822563bc77d71..fd3ac478afdaea9d73baf158545eaf42dc09adc9 100644 --- a/templates/apply.yml +++ b/templates/apply.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/custom-command.yml b/templates/custom-command.yml index 75740aaf7aa09efe240241983699e5735e005b76..6a6ec53c22c5b14d52192773b7db6a0939207486 100644 --- a/templates/custom-command.yml +++ b/templates/custom-command.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/destroy.yml b/templates/destroy.yml index aa0a3fa86be469fefcc41b1366cedf017d1b217e..c21b002a31e6693abafa8260893ef26a247b8dd7 100644 --- a/templates/destroy.yml +++ b/templates/destroy.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/fmt.yml b/templates/fmt.yml index 89c51e109152ff5620f40b22bf6cc32779e01c22..a321df0bb50296920d5687ce181800c0854f98c2 100644 --- a/templates/fmt.yml +++ b/templates/fmt.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml index ef3451de82eb08e159cc047096ee9df117eb0fbc..b8989316b80ce3f39de5bcff32113a6cd740f050 100644 --- a/templates/full-pipeline.yml +++ b/templates/full-pipeline.yml @@ -25,9 +25,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/job-templates.yml b/templates/job-templates.yml index aa435d32188d9c2dd5eb6b3151c4d4649731268a..df48d1be54d99dc19c2afc4df634a5faa5baf3a8 100644 --- a/templates/job-templates.yml +++ b/templates/job-templates.yml @@ -25,9 +25,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/plan.yml b/templates/plan.yml index 94d029d7635377ef1a9c45021729037fa2d5d07c..4a595449f4d5d61b8ed10b0cfa0026d5862afa5e 100644 --- a/templates/plan.yml +++ b/templates/plan.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/test.yml b/templates/test.yml index 6749b36b0097dcbf39d471ae172011e213a765a4..5de8c520aca363d9a83b36cbc8c67433b6910c11 100644 --- a/templates/test.yml +++ b/templates/test.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/validate-plan-apply.yml b/templates/validate-plan-apply.yml index aee7d8903ea01ce119265816e3c5f85494828a02..7b8c8eca5c5d79e1a01dd39c9d6497549c02529d 100644 --- a/templates/validate-plan-apply.yml +++ b/templates/validate-plan-apply.yml @@ -19,9 +19,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/validate-plan.yml b/templates/validate-plan.yml index 0caca76e9227a74c552dc514cc0c9ceabcd4b7a6..9506905e032079b660b9aa86abef3a1b967c133d 100644 --- a/templates/validate-plan.yml +++ b/templates/validate-plan.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/validate.yml b/templates/validate.yml index dab203fd86066ad8b904ceb6925ff6c495083b06..774971e06f38f66841b24483e49cd6ce023f1394 100644 --- a/templates/validate.yml +++ b/templates/validate.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1'