From f090d98c45641879f21a7478a8878ecec356cf85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Mon, 22 Mar 2021 17:16:18 +0100
Subject: [PATCH] gitLab CI: move launcher script into terraform

---
 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a3a7e4..d2f3236 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,8 @@ terraform-single:
       - ".terraform/"
       - "*.tfstate"
   script:
-    - ./launch.sh -var type=hadoop-single -var flavor=standard.large -var n=0 -var domain=terra1 -var image_name=$IMAGE_NAME -var image_visibility=$IMAGE_VISIBILITY
+    - 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
     - 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
@@ -57,7 +58,8 @@ terraform-cluster:
       - ".terraform/"
       - "*.tfstate"
   script:
-    - ./launch.sh -var type=hadoop -var domain=terra2 -var image_name=$IMAGE_NAME -var image_visibility=$IMAGE_VISIBILITY
+    - terraform init
+    - terraform apply -auto-approve -var type=hadoop -var domain=terra2 -var image_name=$IMAGE_NAME -var image_visibility=$IMAGE_VISIBILITY
     - 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
-- 
GitLab