diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 947fd81..1dc650f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,13 +14,6 @@ stages: - validate - build -.parallel: - parallel: - matrix: - - IMAGE: - - flatcar-stable - - talos-v1.10.3 - validate: stage: validate script: @@ -28,10 +21,9 @@ validate: - packer fmt -check images - packer validate images -build-image: - extends: .parallel +build-images: stage: build script: - - packer build $IMAGE.pkr.hcl + - packer build images rules: - if: $CI_COMMIT_BRANCH == "main" diff --git a/images/_hcloud.hcl b/images/_hcloud.hcl new file mode 100644 index 0000000..012e434 --- /dev/null +++ b/images/_hcloud.hcl @@ -0,0 +1,5 @@ +variable "hcloud_token" { + type = string + default = env("HCLOUD_TOKEN") + sensitive = true +} diff --git a/images/talos-v1.10.3.pkr.hcl b/images/talos-v1.10.3.pkr.hcl index c0481c3..0d31edb 100644 --- a/images/talos-v1.10.3.pkr.hcl +++ b/images/talos-v1.10.3.pkr.hcl @@ -14,12 +14,6 @@ locals { talos_version = "v1.10.3" } -variable "hcloud_token" { - type = string - default = env("HCLOUD_TOKEN") - sensitive = true -} - source "hcloud" "talos" { token = var.hcloud_token