From 1f009117698bef7693ed852533dd0c0fc17f1088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 23 Mar 2021 18:21:02 +0100
Subject: [PATCH] Remote deployment - update gitLab CI
---
.gitlab-ci.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2f3236..0e26e88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,8 @@ flake8:
terraform-single:
stage: test
before_script: &before
+ - sudo apt-get update
+ - sudo apt-get install -y --no-install-recommends git
- rm -fv clouds.yaml testsuite.auto.tfvars
- ln -sfv $CLOUDS_YAML clouds.yaml
- ln -sfv $TERRAFORM_CONFIG testsuite.auto.tfvars
@@ -37,10 +39,10 @@ terraform-single:
script:
- terraform init
- terraform apply -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
+ - ip=`jq -r .public_hosts.value.master < config.json`
- eval $(ssh-agent -s)
- ssh-add ./ssh-key.terra1.txt
- - ansible -i ./inventory -m synchronize -a 'use_ssh_args=yes verify_host=yes src=image/tests dest=/opt/ mode=push' master
- - ansible -i ./inventory --become-user=debian -m shell -a 'cd; sh -xe /opt/tests/run-tests.sh' master
+ - ssh -o PreferredAuthentications=publickey deployadm@$ip "sudo -u debian sh -c 'cd; ~deployadm/terraform/image/tests/run-tests.sh'"
- terraform destroy -auto-approve
rules:
- if: '$JOB =~ /all|test-single/'
@@ -60,10 +62,10 @@ terraform-cluster:
script:
- terraform init
- terraform apply -auto-approve -var type=hadoop -var domain=terra2 -var image_name=$IMAGE_NAME -var image_visibility=$IMAGE_VISIBILITY
+ - ip=`jq -r .public_hosts.value.master < config.json`
- eval $(ssh-agent -s)
- ssh-add ./ssh-key.terra2.txt
- - ansible -i ./inventory -m synchronize -a 'use_ssh_args=yes verify_host=yes src=image/tests dest=/opt/ mode=push' master
- - ansible -i ./inventory --become-user=debian -m shell -a 'cd; sh -xe /opt/tests/run-tests.sh' master
+ - ssh -o PreferredAuthentications=publickey deployadm@$ip "sudo -u debian sh -c 'cd; ~deployadm/terraform/image/tests/run-tests.sh'"
- terraform destroy -auto-approve
rules:
- if: '$JOB =~ /all|test-cluster/'
--
GitLab