Skip to content
Snippets Groups Projects
Commit 50b6f2fb authored by Timo Furrer's avatar Timo Furrer
Browse files

Merge branch 'opentofu-1.6.1' into 'main'

Introduce OpenTofu 1.6.1

See merge request components/opentofu!9
parents 9914d7f3 fd5bb469
No related branches found
No related tags found
No related merge requests found
...@@ -42,6 +42,7 @@ stages: ...@@ -42,6 +42,7 @@ stages:
.opentofu-versions: .opentofu-versions:
parallel: parallel:
matrix: matrix:
- OPENTOFU_VERSION: '1.6.1'
- OPENTOFU_VERSION: '1.6.0' - OPENTOFU_VERSION: '1.6.0'
- OPENTOFU_VERSION: '1.6.0-rc1' - OPENTOFU_VERSION: '1.6.0-rc1'
...@@ -50,7 +51,7 @@ variables: ...@@ -50,7 +51,7 @@ variables:
DOCKER_DIND_IMAGE: "docker:24.0.7-dind" DOCKER_DIND_IMAGE: "docker:24.0.7-dind"
# OpenTofu variables # OpenTofu variables
LATEST_OPENTOFU_VERSION: '1.6.0' LATEST_OPENTOFU_VERSION: '1.6.1'
# OpenTofu image build variables: # OpenTofu image build variables:
PLATFORMS: linux/amd64,linux/arm64 PLATFORMS: linux/amd64,linux/arm64
......
...@@ -49,7 +49,7 @@ include: ...@@ -49,7 +49,7 @@ include:
# to find the correctly associated images. # This can be removed # to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved. # once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: latest version: latest
opentofu_version: 1.6.0 opentofu_version: 1.6.1
stages: [validate, build, deploy, cleanup] stages: [validate, build, deploy, cleanup]
...@@ -63,7 +63,7 @@ include: ...@@ -63,7 +63,7 @@ include:
# to find the correctly associated images. # This can be removed # to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved. # once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: 0.0.0-alpha1 version: 0.0.0-alpha1
opentofu_version: 1.6.0 opentofu_version: 1.6.1
stages: [validate, build, deploy, cleanup] stages: [validate, build, deploy, cleanup]
``` ```
...@@ -90,7 +90,7 @@ include: ...@@ -90,7 +90,7 @@ include:
# to find the correctly associated images. # This can be removed # to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved. # once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: latest version: latest
opentofu_version: 1.6.0 opentofu_version: 1.6.1
root_dir: tofu/ root_dir: tofu/
``` ```
......
...@@ -51,7 +51,7 @@ include: ...@@ -51,7 +51,7 @@ include:
# to find the correctly associated images. # This can be removed # to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved. # once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: latest version: latest
opentofu_version: 1.6.0 opentofu_version: 1.6.1
stages: [validate, build, deploy, cleanup] stages: [validate, build, deploy, cleanup]
...@@ -65,7 +65,7 @@ include: ...@@ -65,7 +65,7 @@ include:
# to find the correctly associated images. # This can be removed # to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved. # once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: 0.0.0-alpha1 version: 0.0.0-alpha1
opentofu_version: 1.6.0 opentofu_version: 1.6.1
stages: [validate, build, deploy, cleanup] stages: [validate, build, deploy, cleanup]
``` ```
...@@ -92,7 +92,7 @@ include: ...@@ -92,7 +92,7 @@ include:
# to find the correctly associated images. # This can be removed # to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved. # once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: latest version: latest
opentofu_version: 1.6.0 opentofu_version: 1.6.1
root_dir: tofu/ root_dir: tofu/
``` ```
...@@ -118,7 +118,7 @@ Have a look at the individual template spec to learn about the available inputs. ...@@ -118,7 +118,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_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. | | `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. | | `version` | `latest` | Version of this component. Has to be the same as the one in the component include entry. |
| `opentofu_version` | `1.6.0` | OpenTofu version that should be used. Must be one of `1.6.0`, `1.6.0-rc1`. | | `opentofu_version` | `1.6.1` | OpenTofu version that should be used. Must be one of `1.6.1`, `1.6.0`, `1.6.0-rc1`. |
| `root_dir` | `${CI_PROJECT_DIR}` | Root directory for the OpenTofu project. | | `root_dir` | `${CI_PROJECT_DIR}` | Root directory for the OpenTofu project. |
| `state_name` | `default` | Remote OpenTofu state name. | | `state_name` | `default` | Remote OpenTofu state name. |
| `auto_apply` | `false` | Whether the apply job is manual or automatically run. | | `auto_apply` | `false` | Whether the apply job is manual or automatically run. |
...@@ -130,6 +130,7 @@ Have a look at the individual template spec to learn about the available inputs. ...@@ -130,6 +130,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: The following OpenTofu versions are available with this component via the `opentofu_version` input:
- [`1.6.1`](https://github.com/opentofu/opentofu/releases/tag/v1.6.1)
- [`1.6.0`](https://github.com/opentofu/opentofu/releases/tag/v1.6.0) - [`1.6.0`](https://github.com/opentofu/opentofu/releases/tag/v1.6.0)
- [`1.6.0-rc1`](https://github.com/opentofu/opentofu/releases/tag/v1.6.0-rc1) - [`1.6.0-rc1`](https://github.com/opentofu/opentofu/releases/tag/v1.6.0-rc1)
......
...@@ -16,9 +16,10 @@ spec: ...@@ -16,9 +16,10 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.0' default: '1.6.1'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1' - '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
......
...@@ -16,9 +16,10 @@ spec: ...@@ -16,9 +16,10 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.0' default: '1.6.1'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1' - '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
......
...@@ -16,9 +16,10 @@ spec: ...@@ -16,9 +16,10 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.0' default: '1.6.1'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1' - '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
......
...@@ -22,9 +22,10 @@ spec: ...@@ -22,9 +22,10 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.0' default: '1.6.1'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1' - '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
......
...@@ -16,9 +16,10 @@ spec: ...@@ -16,9 +16,10 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.0' default: '1.6.1'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1' - '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
......
...@@ -19,9 +19,10 @@ spec: ...@@ -19,9 +19,10 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.0' default: '1.6.1'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1' - '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
......
...@@ -16,9 +16,10 @@ spec: ...@@ -16,9 +16,10 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.0' default: '1.6.1'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1' - '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment