From 009e4e7cb32e44352658592b69d5ba9108655a8c Mon Sep 17 00:00:00 2001
From: Nana Janashia <nn_janashia@yahoo.com>
Date: Sat, 3 Apr 2021 19:03:39 +0200
Subject: [PATCH] Fix setting creds

---
 Jenkinsfile-v1            | 4 +++-
 ansible/prepare-server.sh | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile-v1 b/Jenkinsfile-v1
index e05b1d9..82bda74 100644
--- a/Jenkinsfile-v1
+++ b/Jenkinsfile-v1
@@ -41,7 +41,9 @@ pipeline {
                         sshCommand remote: remote, command: "ls -l"
                         
                         // set AWS credentials
-                        sshScript remote: remote, script: "ansible/prepare-server.sh ${AWS_ACCESS_KEY_ID} ${AWS_SECRET_ACCESS_KEY}"
+                        sshScript remote: remote, script: "ansible/prepare-server.sh"
+                        sshCommand remote: remote, command: 'export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID'
+                        sshCommand remote: remote, command: 'export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY'
                         
                         sshCommand remote: remote, command: "ansible-playbook docker-and-compose.yaml"
                     }
diff --git a/ansible/prepare-server.sh b/ansible/prepare-server.sh
index 21dcd98..814531b 100644
--- a/ansible/prepare-server.sh
+++ b/ansible/prepare-server.sh
@@ -5,7 +5,7 @@ apt install ansible -y
 apt install python3-pip -y
 pip3 install boto3 botocore
 
-export AWS_ACCESS_KEY_ID=$1
-export AWS_SECRET_ACCESS_KEY=$2
+# export AWS_ACCESS_KEY_ID=$1
+# export AWS_SECRET_ACCESS_KEY=$2