Update .gitlab-ci.yml, terraform/variables.tf
This commit is contained in:
@@ -25,6 +25,21 @@ format:
|
|||||||
when: always
|
when: always
|
||||||
- when: never
|
- when: never
|
||||||
|
|
||||||
|
validate:
|
||||||
|
stage: lint
|
||||||
|
variables:
|
||||||
|
WORKDIR: $CI_PROJECT_DIR/terraform
|
||||||
|
allow_failure: false
|
||||||
|
extends: .terraform_validate
|
||||||
|
rules:
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
|
changes:
|
||||||
|
compare_to: refs/heads/main
|
||||||
|
paths:
|
||||||
|
- 'terraform/*'
|
||||||
|
when: always
|
||||||
|
- when: never
|
||||||
|
|
||||||
plan:
|
plan:
|
||||||
stage: lint
|
stage: lint
|
||||||
variables:
|
variables:
|
||||||
@@ -32,6 +47,7 @@ plan:
|
|||||||
ARGUMENTS: -var=pm_password=$pm_password -var=pm_api_url=$pm_api_url -var-file=terraform.tfvars
|
ARGUMENTS: -var=pm_password=$pm_password -var=pm_api_url=$pm_api_url -var-file=terraform.tfvars
|
||||||
allow_failure: false
|
allow_failure: false
|
||||||
extends: .terraform_plan
|
extends: .terraform_plan
|
||||||
|
needs: ["validate","format"]
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
changes:
|
changes:
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ variable "k3master" {
|
|||||||
storage = string
|
storage = string
|
||||||
template = string
|
template = string
|
||||||
node = string
|
node = string
|
||||||
ip = list(number)
|
ip = list(number)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user