Merge "Add release job for aaf/cadi"

[ci-management.git] / jjb / integration / integration-macros.yaml

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 11680b6..a6d3695 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -31,6 +31,22 @@
           default: '{html-files}'
           description: 'File name to be used by HTML publisher plugin to produce the report'
 
+- parameter:
+    name: integration-terraform-version
+    parameters:
+      - string:
+          name: TERRAFORM_VERSION
+          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:
@@ -65,8 +81,33 @@
           vagrant plugin install vagrant-libvirt
           vagrant plugin install vagrant-disksize
           vagrant plugin install vagrant-sshfs
+          vagrant plugin install vagrant-reload
           mkdir -p ~/.ssh
 
+- builder:
+   name: integration-install-terraform
+   builders:
+     - shell: |
+         #!/bin/bash
+         set -ex
+         cd /tmp
+         wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+         unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+         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: