From 30fc909581ba8395da0860c22830d9db3913f7b1 Mon Sep 17 00:00:00 2001
From: ShylajaDevadiga <56045581+ShylajaDevadiga@users.noreply.github.com>
Date: Wed, 10 Aug 2022 15:30:57 -0700
Subject: [PATCH] Update run scripts (#5979)

Signed-off-by: Shylaja Devadiga <shylaja@rancher.com>
---
 tests/e2e/scripts/Jenkinsfile  | 11 +++--------
 tests/e2e/scripts/run_tests.sh | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/tests/e2e/scripts/Jenkinsfile b/tests/e2e/scripts/Jenkinsfile
index 06d22a3e0a..b4698bb889 100644
--- a/tests/e2e/scripts/Jenkinsfile
+++ b/tests/e2e/scripts/Jenkinsfile
@@ -1,7 +1,9 @@
 pipeline {
     agent any
     environment {
-        AWS_SSH_PEM_KEY = credentials('AWS_SSH_PEM_KEY')
+	AWS_SSH_PEM_KEY = credentials('AWS_SSH_PEM_KEY')
+	VPN_ENCODED_LOGIN = credentials('VPN_ENCODED_LOGIN')
+	EXTERNAL_ENCODED_VPN = credentials('EXTERNAL_ENCODED_VPN')
     }
         
     stages {
@@ -21,7 +23,6 @@ pipeline {
         stage('Build Cluster'){
             steps {
                 script {
-                    try {
                         sh """
                             cd ${WORKSPACE}/tests/e2e/
                             /usr/bin/docker build -f ./scripts/Dockerfile --build-arg EXTERNAL_ENCODED_VPN="$EXTERNAL_ENCODED_VPN" \
@@ -32,12 +33,6 @@ pipeline {
                             /usr/bin/docker exec createcluster_${BUILD_NUMBER} ./run_tests.sh ${AWS_SSH_KEY_NAME} ${USER} ${NODEIP} \
                             ${NODEOS} ${SERVERCOUNT} ${AGENTCOUNT} ${DB} ${HARDENED}
                         """
-                    } catch(error) {
-                            echo "First build failed, let's retry if accepted"
-                            retry(2) {
-                                build 'k3s_nightly_automation'
-                        }
-                    }
                 }
             }
         }
diff --git a/tests/e2e/scripts/run_tests.sh b/tests/e2e/scripts/run_tests.sh
index d01a2579d8..f5979a6b04 100755
--- a/tests/e2e/scripts/run_tests.sh
+++ b/tests/e2e/scripts/run_tests.sh
@@ -11,22 +11,22 @@ E2E_EXTERNAL_DB=$db && export E2E_EXTERNAL_DB
 eval openvpn --daemon --config external.ovpn &>/dev/null &
 sleep 10
 
-ssh -i "$1"  -o 'StrictHostKeyChecking no' $2@$3 'cd k3s && git pull --rebase origin master'
-ssh -i "$1"  -o 'StrictHostKeyChecking no' $2@$3 '/usr/local/go/bin/go get github.com/onsi/ginkgo/v2'
-ssh -i "$1"  -o 'StrictHostKeyChecking no' $2@$3 '/usr/local/go/bin/go get github.com/onsi/gomega'
-ssh -i "$1"  -o 'StrictHostKeyChecking no' $2@$3 '/usr/local/go/bin/go get github.com/k3s-io/k3s/tests/e2e'
+ssh -i "$1"  -o "StrictHostKeyChecking no" $2@$3 'cd k3s && git pull --rebase origin master'
+ssh -i "$1"  -o "StrictHostKeyChecking no" $2@$3 '/usr/local/go/bin/go get github.com/onsi/ginkgo/v2'
+ssh -i "$1"  -o "StrictHostKeyChecking no" $2@$3 '/usr/local/go/bin/go get github.com/onsi/gomega'
+ssh -i "$1"  -o "StrictHostKeyChecking no" $2@$3 '/usr/local/go/bin/go get github.com/k3s-io/k3s/tests/e2e'
 
 echo 'RUNNING CLUSTER VALIDATION TEST'
-ssh -i "$1"  -o 'StrictHostKeyChecking no' $2@$3 'cd k3s/tests/e2e/validatecluster && vagrant destroy -f'
-ssh -i "$1"  -o 'StrictHostKeyChecking no' $2@$3 "cd k3s/tests/e2e && E2E_HARDENED=$hardened /usr/local/go/bin/go test -v validatecluster/validatecluster_test.go -nodeOS="$4" -serverCount=$((servercount)) -agentCount=$((agentcount)) -timeout=1h"
+ssh -i "$1"  -o "StrictHostKeyChecking no" $2@$3 'cd k3s/tests/e2e/validatecluster && vagrant destroy -f'
+ssh -i "$1"  -o "StrictHostKeyChecking no" $2@$3 "cd k3s/tests/e2e && E2E_HARDENED="$hardened" /usr/local/go/bin/go test -v validatecluster/validatecluster_test.go -nodeOS="$4" -serverCount=$((servercount)) -agentCount=$((agentcount)) -timeout=1h"
 
 echo 'RUNNING SECRETS ENCRYPTION TEST'
-#ssh -i "$1"  -o 'StrictHostKeyChecking no' $2@$3 'cd k3s/tests/e2e/secretsencryption && vagrant destroy -f'
-#ssh -i "$1"  -o 'StrictHostKeyChecking no' $2@$3 "cd k3s/tests/e2e && /usr/local/go/bin/go test -v secretsencryption/secretsencryption_test.go -nodeOS="$4" -serverCount=$((servercount)) -timeout=1h"
+ssh -i "$1"  -o "StrictHostKeyChecking no" $2@$3 'cd k3s/tests/e2e/secretsencryption && vagrant destroy -f'
+ssh -i "$1"  -o "StrictHostKeyChecking no" $2@$3 "cd k3s/tests/e2e && /usr/local/go/bin/go test -v secretsencryption/secretsencryption_test.go -nodeOS="$4" -serverCount=$((servercount)) -timeout=1h"
 
 E2E_RELEASE_VERSION=$k3s_version && export E2E_RELEASE_VERSION
 E2E_RELEASE_CHANNEL=$k3s_channel && export E2E_RELEASE_CHANNEL
 
 echo 'RUNNING CLUSTER UPGRADE TEST'
-#ssh -i "$1"  -o 'StrictHostKeyChecking no' $2@$3 'cd k3s/tests/e2e/upgradecluster && vagrant destroy -f'
-#ssh -i "$1"  -o 'StrictHostKeyChecking no' $2@$3 "cd k3s/tests/e2e && /usr/local/go/bin/go test -v upgradecluster/upgradecluster_test.go -nodeOS="$4" -serverCount=$((servercount)) -agentCount=$((agentcount))  -timeout=1h"
+ssh -i "$1"  -o "StrictHostKeyChecking no" $2@$3 'cd k3s/tests/e2e/upgradecluster && vagrant destroy -f'
+ssh -i "$1"  -o "StrictHostKeyChecking no" $2@$3 "cd k3s/tests/e2e && /usr/local/go/bin/go test -v upgradecluster/upgradecluster_test.go -nodeOS="$4" -serverCount=$((servercount)) -agentCount=$((agentcount))  -timeout=1h"