From 41f2e0e2ca5ced92d6e4b3b87f9db632a568d5f2 Mon Sep 17 00:00:00 2001 From: Craig Barrett Date: Wed, 28 Aug 2019 13:33:52 -0700 Subject: [PATCH] Test after adding missing CI/CD variables in GitLab UI --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ccfa297..3803cf88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,12 +34,12 @@ validate: set +o pipefail echo "running tf validate" # there's no output for empty builds otherwise # SSH setup for module cloning - #eval $(ssh-agent -s) - #echo "$SSH_PRIVATE_KEY" | base64 -d | tr -d '\r' | ssh-add - > /dev/null - #mkdir -p ~/.ssh - #chmod 700 ~/.ssh - #echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - #chmod 644 ~/.ssh/known_hosts + eval $(ssh-agent -s) + echo "$SSH_PRIVATE_KEY" | base64 -d | tr -d '\r' | ssh-add - > /dev/null + mkdir -p ~/.ssh + chmod 700 ~/.ssh + echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts + chmod 644 ~/.ssh/known_hosts cp private/env_vars/common.env.example private/env_vars/common.env dir="environments" # For the "bin/tf-set-env" script @@ -61,12 +61,12 @@ validate: .tf_plan: &tf_plan script: | # SSH setup for module cloning - #eval $(ssh-agent -s) - #echo "$SSH_PRIVATE_KEY" | base64 -d | tr -d '\r' | ssh-add - > /dev/null - #mkdir -p ~/.ssh - #chmod 700 ~/.ssh - #echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - #chmod 644 ~/.ssh/known_hosts + eval $(ssh-agent -s) + echo "$SSH_PRIVATE_KEY" | base64 -d | tr -d '\r' | ssh-add - > /dev/null + mkdir -p ~/.ssh + chmod 700 ~/.ssh + echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts + chmod 644 ~/.ssh/known_hosts # Terraform plan export GOOGLE_CLOUD_KEYFILE_JSON=${GCLOUD_TERRAFORM_PRIVATE_KEY_JSON} -- 2.22.2