From 588d469f4056b9ab8f02a0f067b71fef1d827d63 Mon Sep 17 00:00:00 2001 From: David Fry Date: Fri, 19 May 2023 14:12:46 +0100 Subject: [PATCH] fix for min pw length --- terraform/gitlab/ci-templates/bootstrap/.gitlab-ci.yml | 4 ++-- terraform/gitlab/ci-templates/k8s-cluster/.gitlab-ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/terraform/gitlab/ci-templates/bootstrap/.gitlab-ci.yml b/terraform/gitlab/ci-templates/bootstrap/.gitlab-ci.yml index 05ee91469..936972d7b 100644 --- a/terraform/gitlab/ci-templates/bootstrap/.gitlab-ci.yml +++ b/terraform/gitlab/ci-templates/bootstrap/.gitlab-ci.yml @@ -51,8 +51,8 @@ cache: - source setcivars.sh - yq eval '.' environment.yaml -o=json > environment.json - for var in $(jq -r 'to_entries[] | "\(.key)=\(.value)\n"' ./environment.json); do export $var; done - - if [ "$PRIVATE_REPO_USER" == "notused" ]; then echo "https://${PRIVATE_REPO_USER}:${PRIVATE_REPO_TOKEN}@github.com" > ~/.gitcredentials.store; fi - - if [ "$PRIVATE_REPO_USER" == "notused" ]; then git config --global credential.helper 'store --file ~/.gitcredentials.store'; fi + - if [ "$PRIVATE_REPO_USER" == "nullvalue" ]; then echo "https://${PRIVATE_REPO_USER}:${PRIVATE_REPO_TOKEN}@github.com" > ~/.gitcredentials.store; fi + - if [ "$PRIVATE_REPO_USER" == "nullvalue" ]; then git config --global credential.helper 'store --file ~/.gitcredentials.store'; fi - git config --global advice.detachedHead false - set - git clone ${TEMPLATE_REPO_URL} template-repo diff --git a/terraform/gitlab/ci-templates/k8s-cluster/.gitlab-ci.yml b/terraform/gitlab/ci-templates/k8s-cluster/.gitlab-ci.yml index 07a2bf1c8..0a8b3b953 100644 --- a/terraform/gitlab/ci-templates/k8s-cluster/.gitlab-ci.yml +++ b/terraform/gitlab/ci-templates/k8s-cluster/.gitlab-ci.yml @@ -49,8 +49,8 @@ cache: - source setcivars.sh - yq eval '.' environment.yaml -o=json > environment.json - for var in $(jq -r 'to_entries[] | "\(.key)=\(.value)\n"' ./environment.json); do export $var; done - - if [ "$PRIVATE_REPO_USER" == "notused" ]; then echo "https://${PRIVATE_REPO_USER}:${PRIVATE_REPO_TOKEN}@github.com" > ~/.gitcredentials.store; fi - - if [ "$PRIVATE_REPO_USER" == "notused" ]; then git config --global credential.helper 'store --file ~/.gitcredentials.store'; fi + - if [ "$PRIVATE_REPO_USER" == "nullvalue" ]; then echo "https://${PRIVATE_REPO_USER}:${PRIVATE_REPO_TOKEN}@github.com" > ~/.gitcredentials.store; fi + - if [ "$PRIVATE_REPO_USER" == "nullvalue" ]; then git config --global credential.helper 'store --file ~/.gitcredentials.store'; fi - git config --global advice.detachedHead false - set