From 081ab1146d89f07d5d9225a4e9aa78e1d0e30a76 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 10:01:54 -0300
Subject: [PATCH 01/30] defining basic e2e tests ci

---
 .ci/run_e2e_tests.sh | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .ci/run_e2e_tests.sh

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
new file mode 100644
index 00000000000..222fd1b10c8
--- /dev/null
+++ b/.ci/run_e2e_tests.sh
@@ -0,0 +1,34 @@
+LATEST_KURTOSIS_TAG="kurtosistech/kurtosis:latest"
+LATEST_CONTROLLER_TAG="kurtosistech/ava-test-controller:latest"
+GECKO_IMAGE="${DOCKERHUB_REPO}":"$COMMIT"
+
+#bash "${KURTOSIS_PATH}"/scripts/build_image.sh ${LATEST_KURTOSIS_TAG}
+#docker pull ${LATEST_CONTROLLER_TAG}
+
+(docker run -v /var/run/docker.sock:/var/run/docker.sock \
+--env DEFAULT_GECKO_IMAGE="${DEFAULT_GECKO_IMAGE}" \
+--env TEST_CONTROLLER_IMAGE="${LATEST_CONTROLLER_TAG}" \
+${LATEST_KURTOSIS_TAG}) &
+
+kurtosis_pid=$!
+
+sleep 15
+kill ${kurtosis_pid}
+
+ACTUAL_EXIT_STATUS=$(docker ps -a --latest --filter ancestor=${LATEST_CONTROLLER_TAG} --format="{{.Status}}")
+EXPECTED_EXIT_STATUS="Exited \(0\).*"
+
+echo "${ACTUAL_EXIT_STATUS}"
+
+# Clear containers.
+echo "Clearing kurtosis testnet containers."
+docker rm $(docker stop $(docker ps -a -q --filter ancestor="${GECKO_IMAGE}" --format="{{.ID}}")) >/dev/null
+
+if [[ ${ACTUAL_EXIT_STATUS} =~ ${EXPECTED_EXIT_STATUS} ]]
+then
+  echo "Kurtosis test succeeded."
+  exit 0
+else
+  echo "Kurtosis test failed."
+  exit 1
+fi

From 3eb9efded9f2fd4e5cf440b7c7869030c9f88375 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 10:03:02 -0300
Subject: [PATCH 02/30] modifying travisci yaml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a919fa06dda..1725f39392a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ install:
 
 script: 
  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then .ci/runscript_osx.sh; fi
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/runscript_linux.sh; fi
+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/runscript_linux.sh; .ci/run_e2e_tests.sh; fi
 
 #Need to push to docker hub only from one build
 after_success: 

From 37b7440788f771a19c58c923eadcab8d4b1503a3 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 10:06:36 -0300
Subject: [PATCH 03/30] pulling images

---
 .ci/run_e2e_tests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 222fd1b10c8..d154b996091 100644
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -2,8 +2,8 @@ LATEST_KURTOSIS_TAG="kurtosistech/kurtosis:latest"
 LATEST_CONTROLLER_TAG="kurtosistech/ava-test-controller:latest"
 GECKO_IMAGE="${DOCKERHUB_REPO}":"$COMMIT"
 
-#bash "${KURTOSIS_PATH}"/scripts/build_image.sh ${LATEST_KURTOSIS_TAG}
-#docker pull ${LATEST_CONTROLLER_TAG}
+docker pull ${LATEST_CONTROLLER_TAG}
+docker pull ${LATEST_KURTOSIS_TAG}
 
 (docker run -v /var/run/docker.sock:/var/run/docker.sock \
 --env DEFAULT_GECKO_IMAGE="${DEFAULT_GECKO_IMAGE}" \

From d85a01631087d023b9e9155e196d91ded801a84a Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 10:09:38 -0300
Subject: [PATCH 04/30] e2e tests must be runnable

---
 .ci/run_e2e_tests.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 .ci/run_e2e_tests.sh

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
old mode 100644
new mode 100755

From 0165827857e700424f51d504bc2dcb56411c3776 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 10:28:21 -0300
Subject: [PATCH 05/30] removing osx build to debug kurtosis runs;

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1725f39392a..3b88aaf02ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ jobs:
   include:
     - os: linux
       dist: bionic
-    - os: osx
-      osx_image: xcode11.4
+    #- os: osx
+    #  osx_image: xcode11.4
 services:
 - docker
 env:

From 374062aa1ac0ca3e54a6a8b8531e28117ec35345 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 12:56:16 -0300
Subject: [PATCH 06/30] sleeping 90

---
 .ci/run_e2e_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index d154b996091..84ae0382d4f 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -12,7 +12,7 @@ ${LATEST_KURTOSIS_TAG}) &
 
 kurtosis_pid=$!
 
-sleep 15
+sleep 90
 kill ${kurtosis_pid}
 
 ACTUAL_EXIT_STATUS=$(docker ps -a --latest --filter ancestor=${LATEST_CONTROLLER_TAG} --format="{{.Status}}")

From dea626aea362c2e36e2b758ab56139ce3478eefd Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 13:10:05 -0300
Subject: [PATCH 07/30] putting in debugging statements

---
 .ci/run_e2e_tests.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 84ae0382d4f..ebf9cef8591 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -1,3 +1,5 @@
+set -x
+
 LATEST_KURTOSIS_TAG="kurtosistech/kurtosis:latest"
 LATEST_CONTROLLER_TAG="kurtosistech/ava-test-controller:latest"
 GECKO_IMAGE="${DOCKERHUB_REPO}":"$COMMIT"
@@ -5,8 +7,11 @@ GECKO_IMAGE="${DOCKERHUB_REPO}":"$COMMIT"
 docker pull ${LATEST_CONTROLLER_TAG}
 docker pull ${LATEST_KURTOSIS_TAG}
 
+docker image ls
+echo "MY GECKO IMAGE: ${GECKO_IMAGE}"
+
 (docker run -v /var/run/docker.sock:/var/run/docker.sock \
---env DEFAULT_GECKO_IMAGE="${DEFAULT_GECKO_IMAGE}" \
+--env DEFAULT_GECKO_IMAGE="${GECKO_IMAGE}" \
 --env TEST_CONTROLLER_IMAGE="${LATEST_CONTROLLER_TAG}" \
 ${LATEST_KURTOSIS_TAG}) &
 

From 2036c7233afe6e12fd3816af8c99ee35ca222013 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 13:50:32 -0300
Subject: [PATCH 08/30] building with docker deploy in scripts

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3b88aaf02ba..85a21761bb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_install:
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/before_install_linux.sh; fi
 
 install: 
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then DOCKER_BUILDKIT=1 docker build --progress plain -t $DOCKERHUB_REPO:$COMMIT . ; fi
+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then DOCKER_BUILDKIT=1 docker build --progress plain -t $DOCKERHUB_REPO:$COMMIT -f "./scripts/Dockerfile.deploy" ; fi
 
 script: 
  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then .ci/runscript_osx.sh; fi

From c6954227eb0235bf4e5f8f97fded70dc735cff5c Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 14:09:29 -0300
Subject: [PATCH 09/30] build image script

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

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index ebf9cef8591..20914850cff 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -2,11 +2,20 @@ set -x
 
 LATEST_KURTOSIS_TAG="kurtosistech/kurtosis:latest"
 LATEST_CONTROLLER_TAG="kurtosistech/ava-test-controller:latest"
-GECKO_IMAGE="${DOCKERHUB_REPO}":"$COMMIT"
+#GECKO_IMAGE="${DOCKERHUB_REPO}":"$COMMIT"
 
 docker pull ${LATEST_CONTROLLER_TAG}
 docker pull ${LATEST_KURTOSIS_TAG}
 
+SCRIPTS_PATH=$(cd $(dirname "${BASH_SOURCE[0]}"); pwd)
+SRC_PATH=$(dirname "${SCRIPTS_PATH}")
+
+# build docker image we need
+echo $(pwd)
+bash ${SRC_PATH}/scripts/build_image.sh
+# get docker image label
+GECKO_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
+
 docker image ls
 echo "MY GECKO IMAGE: ${GECKO_IMAGE}"
 

From 6fac7c244625cf01fd5ca465371e5a11b3adf6e6 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 14:13:07 -0300
Subject: [PATCH 10/30] fixing travis yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 85a21761bb4..bb57fc9703d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_install:
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/before_install_linux.sh; fi
 
 install: 
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then DOCKER_BUILDKIT=1 docker build --progress plain -t $DOCKERHUB_REPO:$COMMIT -f "./scripts/Dockerfile.deploy" ; fi
+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then DOCKER_BUILDKIT=1 docker build --progress plain -t $DOCKERHUB_REPO:$COMMIT .; fi
 
 script: 
  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then .ci/runscript_osx.sh; fi

From f8cea1d2999601accfa4786c8d95c01d7db36806 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 14:25:11 -0300
Subject: [PATCH 11/30] travisyml now minimally modified to include kurtosis
 tests

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb57fc9703d..f596a657e23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ jobs:
   include:
     - os: linux
       dist: bionic
-    #- os: osx
-    #  osx_image: xcode11.4
+    - os: osx
+      osx_image: xcode11.4
 services:
 - docker
 env:

From 72330d494ce537e8cb5d26c02d0a08c0ea6a3ddd Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 14:25:47 -0300
Subject: [PATCH 12/30] removing debugging statements

---
 .ci/run_e2e_tests.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 20914850cff..56d778d0711 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -1,8 +1,5 @@
-set -x
-
 LATEST_KURTOSIS_TAG="kurtosistech/kurtosis:latest"
 LATEST_CONTROLLER_TAG="kurtosistech/ava-test-controller:latest"
-#GECKO_IMAGE="${DOCKERHUB_REPO}":"$COMMIT"
 
 docker pull ${LATEST_CONTROLLER_TAG}
 docker pull ${LATEST_KURTOSIS_TAG}
@@ -11,14 +8,10 @@ SCRIPTS_PATH=$(cd $(dirname "${BASH_SOURCE[0]}"); pwd)
 SRC_PATH=$(dirname "${SCRIPTS_PATH}")
 
 # build docker image we need
-echo $(pwd)
 bash ${SRC_PATH}/scripts/build_image.sh
 # get docker image label
 GECKO_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
 
-docker image ls
-echo "MY GECKO IMAGE: ${GECKO_IMAGE}"
-
 (docker run -v /var/run/docker.sock:/var/run/docker.sock \
 --env DEFAULT_GECKO_IMAGE="${GECKO_IMAGE}" \
 --env TEST_CONTROLLER_IMAGE="${LATEST_CONTROLLER_TAG}" \
@@ -32,8 +25,6 @@ kill ${kurtosis_pid}
 ACTUAL_EXIT_STATUS=$(docker ps -a --latest --filter ancestor=${LATEST_CONTROLLER_TAG} --format="{{.Status}}")
 EXPECTED_EXIT_STATUS="Exited \(0\).*"
 
-echo "${ACTUAL_EXIT_STATUS}"
-
 # Clear containers.
 echo "Clearing kurtosis testnet containers."
 docker rm $(docker stop $(docker ps -a -q --filter ancestor="${GECKO_IMAGE}" --format="{{.ID}}")) >/dev/null

From 1ae9c76c5344a135bc3d4f2cbcbe0223aeeb8789 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 31 May 2020 14:48:33 -0300
Subject: [PATCH 13/30] isolating the kurtosis testing

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f596a657e23..bb57fc9703d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ jobs:
   include:
     - os: linux
       dist: bionic
-    - os: osx
-      osx_image: xcode11.4
+    #- os: osx
+    #  osx_image: xcode11.4
 services:
 - docker
 env:

From 1be5daf5cf352b5cdb13ca467b7328050ccd09a0 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Fri, 19 Jun 2020 07:44:28 -0300
Subject: [PATCH 14/30] updating CI

---
 .ci/run_e2e_tests.sh | 56 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 56d778d0711..0e43ba0ede7 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -1,39 +1,39 @@
 LATEST_KURTOSIS_TAG="kurtosistech/kurtosis:latest"
 LATEST_CONTROLLER_TAG="kurtosistech/ava-test-controller:latest"
 
-docker pull ${LATEST_CONTROLLER_TAG}
-docker pull ${LATEST_KURTOSIS_TAG}
+#docker pull ${LATEST_CONTROLLER_TAG}
 
 SCRIPTS_PATH=$(cd $(dirname "${BASH_SOURCE[0]}"); pwd)
 SRC_PATH=$(dirname "${SCRIPTS_PATH}")
 
 # build docker image we need
-bash ${SRC_PATH}/scripts/build_image.sh
+bash "${SRC_PATH}"/scripts/build_image.sh
 # get docker image label
 GECKO_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
 
-(docker run -v /var/run/docker.sock:/var/run/docker.sock \
---env DEFAULT_GECKO_IMAGE="${GECKO_IMAGE}" \
---env TEST_CONTROLLER_IMAGE="${LATEST_CONTROLLER_TAG}" \
-${LATEST_KURTOSIS_TAG}) &
-
-kurtosis_pid=$!
-
-sleep 90
-kill ${kurtosis_pid}
-
-ACTUAL_EXIT_STATUS=$(docker ps -a --latest --filter ancestor=${LATEST_CONTROLLER_TAG} --format="{{.Status}}")
-EXPECTED_EXIT_STATUS="Exited \(0\).*"
-
-# Clear containers.
-echo "Clearing kurtosis testnet containers."
-docker rm $(docker stop $(docker ps -a -q --filter ancestor="${GECKO_IMAGE}" --format="{{.ID}}")) >/dev/null
-
-if [[ ${ACTUAL_EXIT_STATUS} =~ ${EXPECTED_EXIT_STATUS} ]]
-then
-  echo "Kurtosis test succeeded."
-  exit 0
-else
-  echo "Kurtosis test failed."
-  exit 1
-fi
+go get -d -t -v github.com/kurtosis-tech/ava-e2e-tests/...
+
+cd "${GOPATH}"/src/github.com/kurtosis-tech/ava-e2e-tests
+
+./scripts/full_rebuild_and_run.sh
+
+#kurtosis_pid=$!
+#
+#sleep 90
+#kill ${kurtosis_pid}
+#
+#ACTUAL_EXIT_STATUS=$(docker ps -a --latest --filter ancestor=${LATEST_CONTROLLER_TAG} --format="{{.Status}}")
+#EXPECTED_EXIT_STATUS="Exited \(0\).*"
+#
+## Clear containers.
+#echo "Clearing kurtosis testnet containers."
+#docker rm $(docker stop $(docker ps -a -q --filter ancestor="${GECKO_IMAGE}" --format="{{.ID}}")) >/dev/null
+#
+#if [[ ${ACTUAL_EXIT_STATUS} =~ ${EXPECTED_EXIT_STATUS} ]]
+#then
+#  echo "Kurtosis test succeeded."
+#  exit 0
+#else
+#  echo "Kurtosis test failed."
+#  exit 1
+#fi

From 4b22442fd26936e965092881a031397e737fbffb Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Fri, 19 Jun 2020 08:01:06 -0300
Subject: [PATCH 15/30] changing path to access ava-e2e-tests

---
 .ci/run_e2e_tests.sh | 2 +-
 .travis.yml          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 0e43ba0ede7..9b7dac66eb7 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -13,7 +13,7 @@ GECKO_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
 
 go get -d -t -v github.com/kurtosis-tech/ava-e2e-tests/...
 
-cd "${GOPATH}"/src/github.com/kurtosis-tech/ava-e2e-tests
+cd "${E2E_TEST_HOME}" || exit
 
 ./scripts/full_rebuild_and_run.sh
 
diff --git a/.travis.yml b/.travis.yml
index bb57fc9703d..aac0189d310 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ env:
   global:
   - CODECOV_TOKEN="8c18c993-fc6e-4706-998b-01ddc7987804"
   - GECKO_HOME=/go/src/github.com/ava-labs/gecko/
+  - E2E_TEST_HOME=/go/src/github.com/kurtosis-tech/ava-e2e-tests/
   - COMMIT=${TRAVIS_COMMIT::8}
   - DOCKERHUB_REPO=avaplatform/gecko
   - secure: "L/A9+re0NEKP6EV6H9RcTGiDhX3WMvsiWrkRKDYKqnviqbjY30RK6EM4vvjrM4Lrw2QwsO3YKgnku3+zioE/TxEZFkpkbjNUXru0nYBrWAg1TKVsDXnYaIZkHUejfryST3E8N7F4Hx6zCtGEO0sEdUeKuT+MNUIuHezHooTgGzDjMogm70EWMFjQHc7VucTJu7dWU1RBPjovWQ0q9qflrtCpbrvXFIiihQQ1PQha1Q2C4wLakKuLbhhSafue90Mnyss0blaPHy/tyewcASJu4vsGTKRBn0DzttlkNTwuD6+nKrbmJY0ohunnkVFzYjrZAw1gyN+DCDb/lPbz4ZDItKPwrIUPEtL5xuUOrxUZPUh+0io3Q2d6rjaqkdGjd1KQXzbnW1mn0BxX3d3b2UpIqhBn9umYYjHBKnMuoRiTK33b7U9+LF3K84+tEvVDCPeHs/mw6Inp5jGRSravnM6yPQ6feGzogs4+3EMzZXxnkngKFKCsnd67Oe9xfV9amOU2aQAx4jaAwlPjEpBEkUa8YKx3lPznvmUk1QsNCUbLjdSl5JBaXojLJoiuPbj29hp4S5AXXgn+3Hvwk3ndcFCxi6/l1W9mjYSOtFqg3EAUdF4EgnA/ykQg9ZokkoKY0+qgOzG2bKOAYuCDWeGr7P1apToh00ccsQXL81nVPiq7uDw="

From 5cc4aa471875c13cb81a078c943818b74381f551 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Fri, 19 Jun 2020 08:16:43 -0300
Subject: [PATCH 16/30] adding debugging steps

---
 .ci/run_e2e_tests.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 9b7dac66eb7..eec6946abdf 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -1,8 +1,8 @@
-LATEST_KURTOSIS_TAG="kurtosistech/kurtosis:latest"
-LATEST_CONTROLLER_TAG="kurtosistech/ava-test-controller:latest"
-
+#LATEST_CONTROLLER_TAG="kurtosistech/ava-test-controller:latest"
 #docker pull ${LATEST_CONTROLLER_TAG}
 
+set -x
+
 SCRIPTS_PATH=$(cd $(dirname "${BASH_SOURCE[0]}"); pwd)
 SRC_PATH=$(dirname "${SCRIPTS_PATH}")
 
@@ -13,6 +13,13 @@ GECKO_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
 
 go get -d -t -v github.com/kurtosis-tech/ava-e2e-tests/...
 
+ls -ltrh "${GOPATH}"
+ls -ltrh "${GOPATH}"/src/
+ls -ltrh "${GOPATH}"/src/github.com
+ls -ltrh "${GOPATH}"/src/github.com/kurtosis-tech
+ls -ltrh "${GOPATH}"/src/github.com/kurtosis-tech/ava-e2e-tests/
+cd "${GOPATH}"/src/ || exit
+
 cd "${E2E_TEST_HOME}" || exit
 
 ./scripts/full_rebuild_and_run.sh

From ea7b77ca9d9e274e8c1f9483d7f0f5a2ea590931 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Fri, 19 Jun 2020 08:17:35 -0300
Subject: [PATCH 17/30] adding correct cd

---
 .ci/run_e2e_tests.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index eec6946abdf..6a969589e17 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -18,9 +18,7 @@ ls -ltrh "${GOPATH}"/src/
 ls -ltrh "${GOPATH}"/src/github.com
 ls -ltrh "${GOPATH}"/src/github.com/kurtosis-tech
 ls -ltrh "${GOPATH}"/src/github.com/kurtosis-tech/ava-e2e-tests/
-cd "${GOPATH}"/src/ || exit
-
-cd "${E2E_TEST_HOME}" || exit
+cd "${GOPATH}"/src/github.com/kurtosis-tech/ava-e2e-tests/ || exit
 
 ./scripts/full_rebuild_and_run.sh
 

From 9ac4472a27f4ac76acd0e983b6f74eeb400ff192 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Fri, 19 Jun 2020 08:28:39 -0300
Subject: [PATCH 18/30] removing -d

---
 .ci/run_e2e_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 6a969589e17..b457c76d23a 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -11,7 +11,7 @@ bash "${SRC_PATH}"/scripts/build_image.sh
 # get docker image label
 GECKO_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
 
-go get -d -t -v github.com/kurtosis-tech/ava-e2e-tests/...
+go get -t -v github.com/kurtosis-tech/ava-e2e-tests/...
 
 ls -ltrh "${GOPATH}"
 ls -ltrh "${GOPATH}"/src/

From 878056d24a341af689c43cabe5a9ee08dd9acab3 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Fri, 19 Jun 2020 08:49:09 -0300
Subject: [PATCH 19/30] pulling in gopath

---
 .ci/run_e2e_tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index b457c76d23a..628e83be1b1 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -11,10 +11,12 @@ bash "${SRC_PATH}"/scripts/build_image.sh
 # get docker image label
 GECKO_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
 
+export GOPATH="${GOPATH}"
 go get -t -v github.com/kurtosis-tech/ava-e2e-tests/...
 
 ls -ltrh "${GOPATH}"
 ls -ltrh "${GOPATH}"/src/
+ls -ltrh "${GOPATH}"/bin/
 ls -ltrh "${GOPATH}"/src/github.com
 ls -ltrh "${GOPATH}"/src/github.com/kurtosis-tech
 ls -ltrh "${GOPATH}"/src/github.com/kurtosis-tech/ava-e2e-tests/

From 0627c7c28e01885bdeb907acf0bbdee629249872 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Fri, 19 Jun 2020 15:50:09 -0300
Subject: [PATCH 20/30] turning GO111MODULE off to pull

---
 .ci/run_e2e_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 628e83be1b1..67bd2a84d79 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -12,7 +12,7 @@ bash "${SRC_PATH}"/scripts/build_image.sh
 GECKO_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
 
 export GOPATH="${GOPATH}"
-go get -t -v github.com/kurtosis-tech/ava-e2e-tests/...
+GO111MODULE=off go get -t -v github.com/kurtosis-tech/ava-e2e-tests/...
 
 ls -ltrh "${GOPATH}"
 ls -ltrh "${GOPATH}"/src/

From 2e16f2087a58f39b74a64e6f0046feaca70d06b5 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sat, 20 Jun 2020 10:22:55 -0300
Subject: [PATCH 21/30] cleaning up CI script

---
 .ci/run_e2e_tests.sh | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 67bd2a84d79..6aef7a37edc 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -1,46 +1,10 @@
-#LATEST_CONTROLLER_TAG="kurtosistech/ava-test-controller:latest"
-#docker pull ${LATEST_CONTROLLER_TAG}
-
-set -x
-
 SCRIPTS_PATH=$(cd $(dirname "${BASH_SOURCE[0]}"); pwd)
 SRC_PATH=$(dirname "${SCRIPTS_PATH}")
-
-# build docker image we need
+# Build the runnable Gecko docker image
 bash "${SRC_PATH}"/scripts/build_image.sh
-# get docker image label
 GECKO_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
 
-export GOPATH="${GOPATH}"
 GO111MODULE=off go get -t -v github.com/kurtosis-tech/ava-e2e-tests/...
 
-ls -ltrh "${GOPATH}"
-ls -ltrh "${GOPATH}"/src/
-ls -ltrh "${GOPATH}"/bin/
-ls -ltrh "${GOPATH}"/src/github.com
-ls -ltrh "${GOPATH}"/src/github.com/kurtosis-tech
-ls -ltrh "${GOPATH}"/src/github.com/kurtosis-tech/ava-e2e-tests/
 cd "${GOPATH}"/src/github.com/kurtosis-tech/ava-e2e-tests/ || exit
-
 ./scripts/full_rebuild_and_run.sh
-
-#kurtosis_pid=$!
-#
-#sleep 90
-#kill ${kurtosis_pid}
-#
-#ACTUAL_EXIT_STATUS=$(docker ps -a --latest --filter ancestor=${LATEST_CONTROLLER_TAG} --format="{{.Status}}")
-#EXPECTED_EXIT_STATUS="Exited \(0\).*"
-#
-## Clear containers.
-#echo "Clearing kurtosis testnet containers."
-#docker rm $(docker stop $(docker ps -a -q --filter ancestor="${GECKO_IMAGE}" --format="{{.ID}}")) >/dev/null
-#
-#if [[ ${ACTUAL_EXIT_STATUS} =~ ${EXPECTED_EXIT_STATUS} ]]
-#then
-#  echo "Kurtosis test succeeded."
-#  exit 0
-#else
-#  echo "Kurtosis test failed."
-#  exit 1
-#fi

From a523fb184aba68b5e2c6991a6db4e8bf17e0bda6 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sat, 20 Jun 2020 10:24:02 -0300
Subject: [PATCH 22/30] cleaning CI run script

---
 .ci/run_e2e_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 6aef7a37edc..119fcf2fc7e 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -4,7 +4,7 @@ SRC_PATH=$(dirname "${SCRIPTS_PATH}")
 bash "${SRC_PATH}"/scripts/build_image.sh
 GECKO_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
 
+# Turn off GO111MODULE to pull e2e test source code in order to get run script.
 GO111MODULE=off go get -t -v github.com/kurtosis-tech/ava-e2e-tests/...
-
 cd "${GOPATH}"/src/github.com/kurtosis-tech/ava-e2e-tests/ || exit
 ./scripts/full_rebuild_and_run.sh

From 4cacb56cf53aaa6ed435d8a9cd3f3182261da33c Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sat, 20 Jun 2020 12:12:53 -0300
Subject: [PATCH 23/30] commenting controller image label from script

---
 .ci/run_e2e_tests.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 119fcf2fc7e..fa5bb8d65ab 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -7,4 +7,10 @@ GECKO_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
 # Turn off GO111MODULE to pull e2e test source code in order to get run script.
 GO111MODULE=off go get -t -v github.com/kurtosis-tech/ava-e2e-tests/...
 cd "${GOPATH}"/src/github.com/kurtosis-tech/ava-e2e-tests/ || exit
-./scripts/full_rebuild_and_run.sh
+
+bash "./scripts/rebuild_initializer_binary.sh"
+bash "./scripts/rebuild_controller_image.sh"
+# TODO: Make the controller image label a parameter to rebuild_controller_image script
+# Standard controller image label used by above scripts.
+CONTROLLER_IMAGE="kurtosistech/ava-e2e-tests_controller:latest"
+bash "./build/ava-e2e-tests --gecko-image-name=${GECKO_IMAGE} --test-controller-image-name=${CONTROLLER_IMAGE}"

From 551e16fe368a4406a59bf63fdab23edaa1e583ab Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sat, 20 Jun 2020 12:26:36 -0300
Subject: [PATCH 24/30] checking build directory

---
 .ci/run_e2e_tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index fa5bb8d65ab..03c2582b955 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -1,3 +1,5 @@
+set -x
+
 SCRIPTS_PATH=$(cd $(dirname "${BASH_SOURCE[0]}"); pwd)
 SRC_PATH=$(dirname "${SCRIPTS_PATH}")
 # Build the runnable Gecko docker image
@@ -13,4 +15,6 @@ bash "./scripts/rebuild_controller_image.sh"
 # TODO: Make the controller image label a parameter to rebuild_controller_image script
 # Standard controller image label used by above scripts.
 CONTROLLER_IMAGE="kurtosistech/ava-e2e-tests_controller:latest"
+ls -ltrh ./
+ls -ltrh ./build/
 bash "./build/ava-e2e-tests --gecko-image-name=${GECKO_IMAGE} --test-controller-image-name=${CONTROLLER_IMAGE}"

From 0f0439ff159f3210e97ce0ec2ca4f07891e23bd0 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sat, 20 Jun 2020 12:42:23 -0300
Subject: [PATCH 25/30] calling executable raw

---
 .ci/run_e2e_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index 03c2582b955..df6b1c2456e 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -17,4 +17,4 @@ bash "./scripts/rebuild_controller_image.sh"
 CONTROLLER_IMAGE="kurtosistech/ava-e2e-tests_controller:latest"
 ls -ltrh ./
 ls -ltrh ./build/
-bash "./build/ava-e2e-tests --gecko-image-name=${GECKO_IMAGE} --test-controller-image-name=${CONTROLLER_IMAGE}"
+./build/ava-e2e-tests --gecko-image-name="${GECKO_IMAGE}" --test-controller-image-name="${CONTROLLER_IMAGE}"

From 50fba7520babce27ba1fa865b34c175e58c429fa Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sat, 20 Jun 2020 12:54:02 -0300
Subject: [PATCH 26/30] defining just two tests

---
 .ci/run_e2e_tests.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index df6b1c2456e..a4f0b81d7a5 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -15,6 +15,4 @@ bash "./scripts/rebuild_controller_image.sh"
 # TODO: Make the controller image label a parameter to rebuild_controller_image script
 # Standard controller image label used by above scripts.
 CONTROLLER_IMAGE="kurtosistech/ava-e2e-tests_controller:latest"
-ls -ltrh ./
-ls -ltrh ./build/
-./build/ava-e2e-tests --gecko-image-name="${GECKO_IMAGE}" --test-controller-image-name="${CONTROLLER_IMAGE}"
+./build/ava-e2e-tests --gecko-image-name="${GECKO_IMAGE}" --test-controller-image-name="${CONTROLLER_IMAGE}" --test="fiveStakingNodeGetValidatorsTest,fiveStakingNodeFullyConnectedTest"

From f4a428351d6dd5253a99a679428f141c9b17fcfa Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sat, 20 Jun 2020 13:02:04 -0300
Subject: [PATCH 27/30] corrected test-names arg

---
 .ci/run_e2e_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index a4f0b81d7a5..fee386108b7 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -15,4 +15,4 @@ bash "./scripts/rebuild_controller_image.sh"
 # TODO: Make the controller image label a parameter to rebuild_controller_image script
 # Standard controller image label used by above scripts.
 CONTROLLER_IMAGE="kurtosistech/ava-e2e-tests_controller:latest"
-./build/ava-e2e-tests --gecko-image-name="${GECKO_IMAGE}" --test-controller-image-name="${CONTROLLER_IMAGE}" --test="fiveStakingNodeGetValidatorsTest,fiveStakingNodeFullyConnectedTest"
+./build/ava-e2e-tests --gecko-image-name="${GECKO_IMAGE}" --test-controller-image-name="${CONTROLLER_IMAGE}" --test-names="fiveStakingNodeGetValidatorsTest,fiveStakingNodeFullyConnectedTest"

From 6a37d268bcce86eef0c24c77b98c77b77f840911 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 21 Jun 2020 16:12:53 -0300
Subject: [PATCH 28/30] replacing whitespace

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index aac0189d310..559bed8db52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ before_install:
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/before_install_linux.sh; fi
 
 install: 
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then DOCKER_BUILDKIT=1 docker build --progress plain -t $DOCKERHUB_REPO:$COMMIT .; fi
+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then DOCKER_BUILDKIT=1 docker build --progress plain -t $DOCKERHUB_REPO:$COMMIT . ; fi
 
 script: 
  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then .ci/runscript_osx.sh; fi

From e2aea232147da693608bf67844eb8a9fe332a87f Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 21 Jun 2020 16:13:59 -0300
Subject: [PATCH 29/30] re-enabling osx

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 559bed8db52..b06f3c2ebff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ jobs:
   include:
     - os: linux
       dist: bionic
-    #- os: osx
-    #  osx_image: xcode11.4
+    - os: osx
+      osx_image: xcode11.4
 services:
 - docker
 env:

From 62340e4f29c2ac4978dea280d6461e4d159c6421 Mon Sep 17 00:00:00 2001
From: galenmarchetti <galenmarchetti@gmail.com>
Date: Sun, 21 Jun 2020 17:09:12 -0300
Subject: [PATCH 30/30] removing set x

---
 .ci/run_e2e_tests.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.ci/run_e2e_tests.sh b/.ci/run_e2e_tests.sh
index fee386108b7..82126d1f66c 100755
--- a/.ci/run_e2e_tests.sh
+++ b/.ci/run_e2e_tests.sh
@@ -1,5 +1,3 @@
-set -x
-
 SCRIPTS_PATH=$(cd $(dirname "${BASH_SOURCE[0]}"); pwd)
 SRC_PATH=$(dirname "${SCRIPTS_PATH}")
 # Build the runnable Gecko docker image