From bed68f7c151ec062c19278ce5204d1e0c26f1bce Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Mon, 14 Sep 2020 12:50:55 +0200 Subject: [PATCH] Deploy terragrunt in integration/terraform project template This will install terragrunt on CI minion for integration-terraform-verify job Change-Id: I6c558939dc26c3bdddf43ac8534944ea73465e36 Issue-ID: INT-1713 Signed-off-by: Bartek Grzybowski --- jjb/integration/integration-macros.yaml | 20 ++++++++++++++++++++ jjb/integration/integration-templates.yaml | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 89e83c268..a6d3695ea 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -39,6 +39,14 @@ default: '{terraform-version}' description: 'Terraform version to install on minion' +- parameter: + name: integration-terragrunt-version + parameters: + - string: + name: TERRAGRUNT_VERSION + default: '{terragrunt-version}' + description: 'Terragrunt version to install on minion' + - builder: name: integration-install-robotframework builders: @@ -88,6 +96,18 @@ sudo mv terraform /usr/local/bin/ terraform version +- builder: + name: integration-install-terragrunt + builders: + - shell: | + #!/bin/bash + set -ex + cd /tmp + wget -q https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/terragrunt_linux_amd64 + sudo mv terragrunt_linux_amd64 /usr/local/bin/terragrunt + sudo chmod +x /usr/local/bin/terragrunt + terragrunt --version + - builder: name: integration-docker-compose-logs builders: diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 42c069764..77be42b97 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -109,6 +109,7 @@ <<: *tox_verify_boilerplate name: '{project-name}-{stream}-{subproject}-terraform-verify' terraform-version: 0.13.2 + terragrunt-version: 0.24.1 python-version: python3 id: integration-terraform-verify description: 'Job intended for validating terraform modules' @@ -123,9 +124,12 @@ tox-envs: '{tox-envs}' - integration-terraform-version: terraform-version: '{terraform-version}' + - integration-terragrunt-version: + terragrunt-version: '{terragrunt-version}' builders: - integration-install-terraform + - integration-install-terragrunt - lf-infra-tox-install: python-version: '{python-version}' - lf-infra-tox-run: -- 2.16.6