From 51a95157f59a7505db3d79a1c610626f1df4e675 Mon Sep 17 00:00:00 2001 From: Ana Calva Date: Thu, 21 Mar 2024 10:59:03 +0100 Subject: [PATCH 1/3] Included container to python pipeline --- .github/workflows/release-terraform.yaml | 13 +------------ .github/workflows/vm-creation-terraform.yaml | 10 ++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release-terraform.yaml b/.github/workflows/release-terraform.yaml index 043a561..2c9354b 100644 --- a/.github/workflows/release-terraform.yaml +++ b/.github/workflows/release-terraform.yaml @@ -33,15 +33,4 @@ jobs: release-message: "${{ github.event.inputs.release-message }}" environment-name: k8s runs-on: ghr-proxmox-vm-sthings-cicd - continue-error: false - - VM-Creation-Terraform: - if: github.event.ref == 'refs/heads/main' - name: VM-Creation - needs: Release-Terraform - uses: stuttgart-things/stuttgart-things/.github/workflows/vm-creation-terraform.yaml@main - with: - module-name: proxmox-vm - environment-name: k8s - runs-on: ghr-proxmox-vm-sthings-cicd - continue-error: false + continue-error: false \ No newline at end of file diff --git a/.github/workflows/vm-creation-terraform.yaml b/.github/workflows/vm-creation-terraform.yaml index b6fa9e5..357f391 100644 --- a/.github/workflows/vm-creation-terraform.yaml +++ b/.github/workflows/vm-creation-terraform.yaml @@ -22,6 +22,10 @@ jobs: build-terraform-file: runs-on: ghr-proxmox-vm-sthings-cicd + container: + image: hashicorp/terraform:1.7.0 + environment: k8s + steps: - uses: actions/checkout@v4 @@ -53,6 +57,9 @@ jobs: test-terraform-apply: needs: build-terraform-file runs-on: ghr-proxmox-vm-sthings-cicd + container: + image: hashicorp/terraform:1.7.0 + environment: k8s steps: - uses: actions/checkout@v4 @@ -89,6 +96,9 @@ jobs: if: ${{ always() }} needs: test-terraform-apply runs-on: ghr-proxmox-vm-sthings-cicd + container: + image: hashicorp/terraform:1.7.0 + environment: k8s steps: - uses: actions/checkout@v4 From 2f517bd5a05d9cf6f01859674fcdaa7872d16d7d Mon Sep 17 00:00:00 2001 From: Ana Calva Date: Thu, 21 Mar 2024 11:32:58 +0100 Subject: [PATCH 2/3] Include terraform in action --- .github/workflows/vm-creation-terraform.yaml | 37 ++++++++------------ tests/terraform_apply.py | 2 +- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/.github/workflows/vm-creation-terraform.yaml b/.github/workflows/vm-creation-terraform.yaml index 357f391..4ed0e5e 100644 --- a/.github/workflows/vm-creation-terraform.yaml +++ b/.github/workflows/vm-creation-terraform.yaml @@ -21,18 +21,14 @@ env: jobs: build-terraform-file: - runs-on: ghr-proxmox-vm-sthings-cicd - container: - image: hashicorp/terraform:1.7.0 - environment: k8s - + runs-on: ghr-proxmox-vm-sthings-cicd steps: - - uses: actions/checkout@v4 - - name: Setup Python uses: actions/setup-python@v5 with: python-version: '3.10' + env: + AGENT_TOOLSDIRECTORY: /home/runner/_work/_tool - name: Install dependencies run: | @@ -47,27 +43,23 @@ jobs: with: name: terraform_main path: main.tf - - - name: DEBUG - shell: bash - run: | - echo "/home/runner/_work/_tool/" - ls -la /home/runner/_work/_tool/ test-terraform-apply: needs: build-terraform-file runs-on: ghr-proxmox-vm-sthings-cicd - container: - image: hashicorp/terraform:1.7.0 - environment: k8s steps: - - uses: actions/checkout@v4 + - name: Checkout code + uses: actions/checkout@v4.1.1 - name: Setup Python uses: actions/setup-python@v5 with: python-version: '3.10' + - uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "1.7.0" + - name: Install dependencies run: | python -m pip install github-action-utils python-terraform @@ -96,17 +88,18 @@ jobs: if: ${{ always() }} needs: test-terraform-apply runs-on: ghr-proxmox-vm-sthings-cicd - container: - image: hashicorp/terraform:1.7.0 - environment: k8s steps: - - uses: actions/checkout@v4 - + - name: Checkout code + uses: actions/checkout@v4.1.1 - name: Setup Python uses: actions/setup-python@v5 with: python-version: '3.10' + - uses: hashicorp/setup-terraform@v3 + with: + terraform_version: "1.7.0" + - name: Install dependencies run: | python -m pip install github-action-utils python-terraform diff --git a/tests/terraform_apply.py b/tests/terraform_apply.py index 55366a3..f3133d3 100644 --- a/tests/terraform_apply.py +++ b/tests/terraform_apply.py @@ -8,7 +8,7 @@ def main(): # Initialize the Terraform working directory global tf - tf = python_terraform.Terraform(working_dir='.', variables=tfvars) #, terraform_bin_path='/home/runner/k8s') + tf = python_terraform.Terraform(working_dir='.', variables=tfvars) tf.init() # Run terraform Apply and Terraform Destroy From d49401e73c6811e74316c016ab92be58ecb3fc2c Mon Sep 17 00:00:00 2001 From: Ana Calva Date: Thu, 21 Mar 2024 11:34:43 +0100 Subject: [PATCH 3/3] Include terraform in action --- .github/workflows/vm-creation-terraform.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vm-creation-terraform.yaml b/.github/workflows/vm-creation-terraform.yaml index 4ed0e5e..91d8d52 100644 --- a/.github/workflows/vm-creation-terraform.yaml +++ b/.github/workflows/vm-creation-terraform.yaml @@ -23,6 +23,8 @@ jobs: build-terraform-file: runs-on: ghr-proxmox-vm-sthings-cicd steps: + - name: Checkout code + uses: actions/checkout@v4.1.1 - name: Setup Python uses: actions/setup-python@v5 with: @@ -49,7 +51,7 @@ jobs: runs-on: ghr-proxmox-vm-sthings-cicd steps: - name: Checkout code - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.1.1 - name: Setup Python uses: actions/setup-python@v5 @@ -90,7 +92,8 @@ jobs: runs-on: ghr-proxmox-vm-sthings-cicd steps: - name: Checkout code - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.1.1 + - name: Setup Python uses: actions/setup-python@v5 with: