From af25fa72e4874e3a4ae46d3955cd05e28c93018a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Sat, 24 Sep 2022 21:50:55 +0200
Subject: [PATCH] gitLab CI: shell check
---
.gitlab-ci.yml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d271fa..a827ddd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,8 +36,8 @@ test-single:
- sudo apt-get update
- sudo apt-get install -y --no-install-recommends git
- rm -fv clouds.yaml testsuite.auto.tfvars gitlab.tf
- - ln -sfv $CLOUDS_YAML clouds.yaml
- - ln -sfv $TERRAFORM_CONFIG testsuite.auto.tfvars
+ - ln -sfv "$CLOUDS_YAML" clouds.yaml
+ - ln -sfv "$TERRAFORM_CONFIG" testsuite.auto.tfvars
# GitLab remote terraform state
- printf 'terraform {\n backend "http" {\n }\n}\n' > gitlab.tf
# https://github.com/terraform-provider-openstack/terraform-provider-openstack/issues/1160
@@ -53,13 +53,13 @@ test-single:
- ".terraform/"
- "ip.txt"
script:
- - args="-auto-approve -var type=hadoop-single -var flavor=standard.large -var n=0 -var domain=terra1 -var image_name=$IMAGE_NAME -var image_visibility=$IMAGE_VISIBILITY -var floating_ip=$ip"
- - terraform apply $args
+ - args=(-auto-approve -var type=hadoop-single -var flavor=standard.large -var n=0 -var domain=terra1 -var "image_name=$IMAGE_NAME" -var "image_visibility=$IMAGE_VISIBILITY" -var "floating_ip=$ip")
+ - terraform apply "${args[@]}"
- eval $(ssh-agent -s)
- ssh-add ./ssh-key.terra1.txt
- - ssh -o PreferredAuthentications=publickey deployadm@$ip "sudo -u debian sh -c 'cd; ~deployadm/terraform/image/tests/run-tests.sh'"
- - terraform destroy $args
- - openstack floating ip delete $ip
+ - ssh -o PreferredAuthentications=publickey "deployadm@$ip" "sudo -u debian sh -c 'cd; ~deployadm/terraform/image/tests/run-tests.sh'"
+ - terraform destroy "${args[@]}"
+ - openstack floating ip delete "$ip"
- rm -fv ip.txt
rules:
- if: '$JOB =~ /all|test-single/'
@@ -78,13 +78,13 @@ test-cluster:
- ".terraform/"
- "ip.txt"
script:
- - args="-auto-approve -var type=hadoop -var domain=terra2 -var image_name=$IMAGE_NAME -var image_visibility=$IMAGE_VISIBILITY -var floating_ip=$ip"
- - terraform apply $args
+ - args=(-auto-approve -var type=hadoop -var domain=terra2 -var "image_name=$IMAGE_NAME" -var "image_visibility=$IMAGE_VISIBILITY" -var "floating_ip=$ip")
+ - terraform apply "${args[@]}"
- eval $(ssh-agent -s)
- ssh-add ./ssh-key.terra2.txt
- - ssh -o PreferredAuthentications=publickey deployadm@$ip "sudo -u debian sh -c 'cd; ~deployadm/terraform/image/tests/run-tests.sh'"
- - terraform destroy $args
- - openstack floating ip delete $ip
+ - ssh -o PreferredAuthentications=publickey "deployadm@$ip" "sudo -u debian sh -c 'cd; ~deployadm/terraform/image/tests/run-tests.sh'"
+ - terraform destroy "${args[@]}"
+ - openstack floating ip delete "$ip"
- rm -fv ip.txt
rules:
- if: '$JOB =~ /all|test-cluster/'
--
GitLab