From 6d4ae4c345f4b65620a7db6dde2b27a355dc7f52 Mon Sep 17 00:00:00 2001
From: Souhaila Noor <souhaila.noor@molecula.com>
Date: Mon, 8 Nov 2021 11:34:10 -0600
Subject: [PATCH] changed var assignment

---
 .gitlab/.gitlab-ci.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index c590c1885..c1675d40b 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -210,19 +210,25 @@ deploy node for linux amd64:
     - PUBLIC_IP=$(aws ec2 describe-instances --filters 'Name=tag:Name, Values=linux-amd64-node' 'Name=instance-state-name, Values=running' --query 'Reservations[*].Instances[*].PublicIpAddress' --output text --profile $PROFILE)
     - echo $PUBLIC_IP
     - INSTANCE_ID=$(aws ec2 describe-instances --filters 'Name=tag:Name, Values=linux-amd64-node' 'Name=instance-state-name, Values=running' --query 'Reservations[*].Instances[*].InstanceId' --output text --profile $PROFILE)
-    - echo $INSTANCE_ID
+    - echo $INSTANCE_ID > linux-amd64-instance.txt
     - scp  -o StrictHostKeyChecking=no -i gitlab-featurebase-dev.pem featurebase_linux_amd64 ec2-user@$PUBLIC_IP:.
     - scp  -o StrictHostKeyChecking=no -i gitlab-featurebase-dev.pem .gitlab/featurebase.conf .gitlab/featurebase.service ec2-user@$PUBLIC_IP:.
   needs:
     job: build for linux amd64
+  artifacts:
+    paths:
+      - linux-amd64-instance.txt
 
 run featurebase in linux amd64 node:
   stage: lint
   image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
+  variables:
+    INSTANCE_ID: ""
   before_script:
     - aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
     - aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
     - aws configure set region "us-east-2"
+    - INSTANCE_ID=$(cat linux-amd64-instance.txt)
     - echo $INSTANCE_ID
   script:
     - aws ssm send-command --document-name "AWS-RunShellScript" --targets "Key=InstanceIds,Values=$INSTANCE_ID" --cli-input-json file://.gitlab/configureFeatureBase.json
@@ -234,10 +240,13 @@ run featurebase in linux amd64 node:
 terminate node for linux amd64:
   stage: lint
   image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
+  variables:
+    INSTANCE_ID: ""
   before_script:
     - aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
     - aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
     - aws configure set region "us-east-2"
+    - INSTANCE_ID=$(echo "$(<linux-amd64-instance.txt)")
     - echo $INSTANCE_ID
   script:
     - aws ec2 terminate-instances --instance-ids $INSTANCE_ID