From 573f93edbb156877ec58a1301263d9c817cc1718 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Fri, 22 May 2020 18:38:01 -0700
Subject: [PATCH 01/18] Ignore log errors

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

diff --git a/end2end/print_logs.sh b/end2end/print_logs.sh
index 088629f07d..c7c934cdf1 100755
--- a/end2end/print_logs.sh
+++ b/end2end/print_logs.sh
@@ -12,9 +12,9 @@ echo $pods | while read -a podarray; do
       echo "Logs for ${i}"
       echo "------------------------------------------"
       if [[ $i == *"flyteadmin"* ]]; then
-        kubectl -n flyte logs $i -c flyteadmin
+        kubectl -n flyte logs $i -c flyteadmin || true
       else
-        kubectl -n flyte logs $i
+        kubectl -n flyte logs $i || true
       fi
   done
 done

From 5109b802281a292e365234c1a7028ac6a5941c6d Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Fri, 22 May 2020 20:09:04 -0700
Subject: [PATCH 02/18] Log k8s state before timing out

---
 end2end/dockernetes_run.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/end2end/dockernetes_run.sh b/end2end/dockernetes_run.sh
index 67de1f569b..3e64bdd2d9 100755
--- a/end2end/dockernetes_run.sh
+++ b/end2end/dockernetes_run.sh
@@ -11,6 +11,7 @@ while ! systemctl is-active --quiet multi-user.target; do
   sleep 2
   if [ "$SECONDS" -gt "$K8S_TIMEOUT" ]; then
     echo "ERROR: timed out waiting for kubernetes to start."
+    kubectl get all --all-namespaces
     exit 1
   fi
 done

From 3aa52458321251573453e1915b50196efc15b64c Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Sat, 23 May 2020 17:03:51 -0700
Subject: [PATCH 03/18] Ignore k8s timeout

---
 end2end/dockernetes_run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/end2end/dockernetes_run.sh b/end2end/dockernetes_run.sh
index 3e64bdd2d9..b7fb43fe47 100755
--- a/end2end/dockernetes_run.sh
+++ b/end2end/dockernetes_run.sh
@@ -12,7 +12,7 @@ while ! systemctl is-active --quiet multi-user.target; do
   if [ "$SECONDS" -gt "$K8S_TIMEOUT" ]; then
     echo "ERROR: timed out waiting for kubernetes to start."
     kubectl get all --all-namespaces
-    exit 1
+    # exit 1
   fi
 done
 

From 4ea55b0d2d505bb3e0b050879fe7f05a1fc655f9 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Sat, 23 May 2020 17:14:52 -0700
Subject: [PATCH 04/18] wip

---
 end2end/dockernetes_run.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/end2end/dockernetes_run.sh b/end2end/dockernetes_run.sh
index b7fb43fe47..d80f9b5517 100755
--- a/end2end/dockernetes_run.sh
+++ b/end2end/dockernetes_run.sh
@@ -13,6 +13,7 @@ while ! systemctl is-active --quiet multi-user.target; do
     echo "ERROR: timed out waiting for kubernetes to start."
     kubectl get all --all-namespaces
     # exit 1
+    break
   fi
 done
 

From 5bae61805de7e231be2ef36618e5141ac1500cec Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Sat, 23 May 2020 19:10:52 -0700
Subject: [PATCH 05/18] more logs

---
 end2end/dockernetes_run.sh | 2 +-
 end2end/print_logs.sh      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/end2end/dockernetes_run.sh b/end2end/dockernetes_run.sh
index d80f9b5517..0d10669e8c 100755
--- a/end2end/dockernetes_run.sh
+++ b/end2end/dockernetes_run.sh
@@ -20,4 +20,4 @@ done
 echo "kubernetes started in $SECONDS seconds."
 echo ""
 
-exec $1
+exec $
diff --git a/end2end/print_logs.sh b/end2end/print_logs.sh
index c7c934cdf1..99fddc53f8 100755
--- a/end2end/print_logs.sh
+++ b/end2end/print_logs.sh
@@ -2,6 +2,8 @@
 
 set -ex
 
+kubectl get all --all-namespaces
+
 function get_flyte_pods() {
     echo $(kubectl -n flyte get pods | awk '{print $1}' | grep -v NAME)
 }

From a844116aba5d01803d877a5eb082055f24e57053 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Sat, 23 May 2020 19:22:55 -0700
Subject: [PATCH 06/18] wip

---
 end2end/dockernetes_run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/end2end/dockernetes_run.sh b/end2end/dockernetes_run.sh
index 0d10669e8c..d80f9b5517 100755
--- a/end2end/dockernetes_run.sh
+++ b/end2end/dockernetes_run.sh
@@ -20,4 +20,4 @@ done
 echo "kubernetes started in $SECONDS seconds."
 echo ""
 
-exec $
+exec $1

From db514ef6db6004b74e2e26579c94a40f97cc1fd4 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Sat, 23 May 2020 20:06:53 -0700
Subject: [PATCH 07/18] wip

---
 end2end/print_logs.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/end2end/print_logs.sh b/end2end/print_logs.sh
index 99fddc53f8..9676f0e0f4 100755
--- a/end2end/print_logs.sh
+++ b/end2end/print_logs.sh
@@ -13,6 +13,8 @@ echo $pods | while read -a podarray; do
   for i in "${podarray[@]}"; do
       echo "Logs for ${i}"
       echo "------------------------------------------"
+
+      kubectl -n flyte describe pod $i || true
       if [[ $i == *"flyteadmin"* ]]; then
         kubectl -n flyte logs $i -c flyteadmin || true
       else

From 931d46f96bc87e6f260e40c01e0a654016f2d6b2 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Mon, 25 May 2020 12:18:14 -0700
Subject: [PATCH 08/18] wip

---
 end2end/launch_dockernetes.sh | 1 +
 end2end/print_logs.sh         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/end2end/launch_dockernetes.sh b/end2end/launch_dockernetes.sh
index 80fb1c8c53..8c7b65a091 100755
--- a/end2end/launch_dockernetes.sh
+++ b/end2end/launch_dockernetes.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
+df -H
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 # stop any existing test container that might be running
diff --git a/end2end/print_logs.sh b/end2end/print_logs.sh
index 9676f0e0f4..f02c5cb1cc 100755
--- a/end2end/print_logs.sh
+++ b/end2end/print_logs.sh
@@ -2,6 +2,7 @@
 
 set -ex
 
+df -H
 kubectl get all --all-namespaces
 
 function get_flyte_pods() {

From 0a38471a69f35db4eb0a3aa935df39a77b503d02 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Mon, 25 May 2020 12:28:31 -0700
Subject: [PATCH 09/18] wip

---
 end2end/dockernetes_run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/end2end/dockernetes_run.sh b/end2end/dockernetes_run.sh
index d80f9b5517..faed1ded4d 100755
--- a/end2end/dockernetes_run.sh
+++ b/end2end/dockernetes_run.sh
@@ -4,7 +4,7 @@ set -e
 echo ""
 echo "waiting up to 5 minutes for kubernetes to start..."
 
-K8S_TIMEOUT="300"
+K8S_TIMEOUT="60"
 
 SECONDS=0
 while ! systemctl is-active --quiet multi-user.target; do

From 910e8b9e84158b3aa1ab56602372424f94ac8444 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Mon, 25 May 2020 12:44:02 -0700
Subject: [PATCH 10/18] wip

---
 end2end/execute.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/end2end/execute.sh b/end2end/execute.sh
index 39cd11e4e1..380ace7d47 100755
--- a/end2end/execute.sh
+++ b/end2end/execute.sh
@@ -23,6 +23,7 @@ fi
 
 # This is a separate function so that we can potentially reuse in the future when we have more than one test
 function wait_for_flyte_deploys() {
+    df -H
     SECONDS=0
     echo ""
     echo "waiting for flyte deploy to complete..."

From 92e55aeaaba88d280e762322bf4466a64055a7b9 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Mon, 25 May 2020 12:58:14 -0700
Subject: [PATCH 11/18] wip

---
 end2end/dockernetes_run.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/end2end/dockernetes_run.sh b/end2end/dockernetes_run.sh
index faed1ded4d..9591989f98 100755
--- a/end2end/dockernetes_run.sh
+++ b/end2end/dockernetes_run.sh
@@ -12,6 +12,7 @@ while ! systemctl is-active --quiet multi-user.target; do
   if [ "$SECONDS" -gt "$K8S_TIMEOUT" ]; then
     echo "ERROR: timed out waiting for kubernetes to start."
     kubectl get all --all-namespaces
+    kubectl describe nodes
     # exit 1
     break
   fi

From 1d349bc7d145f0825fd7d409e23888cdaaae943d Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Mon, 25 May 2020 13:34:44 -0700
Subject: [PATCH 12/18] wip

---
 end2end/dockernetes_run.sh | 2 +-
 end2end/print_logs.sh      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/end2end/dockernetes_run.sh b/end2end/dockernetes_run.sh
index 9591989f98..49a3ea3ee4 100755
--- a/end2end/dockernetes_run.sh
+++ b/end2end/dockernetes_run.sh
@@ -4,7 +4,7 @@ set -e
 echo ""
 echo "waiting up to 5 minutes for kubernetes to start..."
 
-K8S_TIMEOUT="60"
+K8S_TIMEOUT="120"
 
 SECONDS=0
 while ! systemctl is-active --quiet multi-user.target; do
diff --git a/end2end/print_logs.sh b/end2end/print_logs.sh
index f02c5cb1cc..26e37b36f4 100755
--- a/end2end/print_logs.sh
+++ b/end2end/print_logs.sh
@@ -5,6 +5,9 @@ set -ex
 df -H
 kubectl get all --all-namespaces
 
+echo "kubectl describe nodes"
+kubectl describe nodes
+
 function get_flyte_pods() {
     echo $(kubectl -n flyte get pods | awk '{print $1}' | grep -v NAME)
 }

From eeea0e55dbc4fda309e2bdba2a3db63b7f3c7c54 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Mon, 25 May 2020 17:44:53 -0700
Subject: [PATCH 13/18] wip

---
 end2end/launch_dockernetes.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/end2end/launch_dockernetes.sh b/end2end/launch_dockernetes.sh
index 8c7b65a091..249db2f500 100755
--- a/end2end/launch_dockernetes.sh
+++ b/end2end/launch_dockernetes.sh
@@ -20,7 +20,7 @@ docker run \
   --volume $DIR/..:/flyte \
   --name dockernetes \
   --env "DOCKERNETES_DEBUG=${DOCKERNETES_DEBUG}" \
-  lyft/dockernetes:7692164d7e6b3963bbcc39a3f5510495509cb71a /sbin/init
+  lyft/dockernetes:a65a0237bfaf9055b7503473515c8dd5c99df07a /sbin/init
 
 # wait for the system to initalize, then run execute.sh
 if [ -n "$DOCKERNETES_DEBUG" ]; then

From 79ac174121b582a74897647acd45a02d3639b293 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Mon, 25 May 2020 18:04:13 -0700
Subject: [PATCH 14/18] wip

---
 end2end/dockernetes_run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/end2end/dockernetes_run.sh b/end2end/dockernetes_run.sh
index 49a3ea3ee4..d83b65c510 100755
--- a/end2end/dockernetes_run.sh
+++ b/end2end/dockernetes_run.sh
@@ -4,7 +4,7 @@ set -e
 echo ""
 echo "waiting up to 5 minutes for kubernetes to start..."
 
-K8S_TIMEOUT="120"
+K8S_TIMEOUT="300"
 
 SECONDS=0
 while ! systemctl is-active --quiet multi-user.target; do

From 505889fbf5de9f6f922d6c26085cfbb6d249eca3 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Mon, 25 May 2020 20:36:49 -0700
Subject: [PATCH 15/18] wip

---
 end2end/print_logs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/end2end/print_logs.sh b/end2end/print_logs.sh
index 26e37b36f4..eb22d0b1f0 100755
--- a/end2end/print_logs.sh
+++ b/end2end/print_logs.sh
@@ -5,7 +5,7 @@ set -ex
 df -H
 kubectl get all --all-namespaces
 
-echo "kubectl describe nodes"
+echo "print_logs kubectl describe nodes"
 kubectl describe nodes
 
 function get_flyte_pods() {

From 94c17576ec7797d3e4da454d3a2f2f2bb0759e95 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Tue, 26 May 2020 11:43:27 -0700
Subject: [PATCH 16/18] wip

---
 end2end/launch_dockernetes.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/end2end/launch_dockernetes.sh b/end2end/launch_dockernetes.sh
index 249db2f500..8c7b65a091 100755
--- a/end2end/launch_dockernetes.sh
+++ b/end2end/launch_dockernetes.sh
@@ -20,7 +20,7 @@ docker run \
   --volume $DIR/..:/flyte \
   --name dockernetes \
   --env "DOCKERNETES_DEBUG=${DOCKERNETES_DEBUG}" \
-  lyft/dockernetes:a65a0237bfaf9055b7503473515c8dd5c99df07a /sbin/init
+  lyft/dockernetes:7692164d7e6b3963bbcc39a3f5510495509cb71a /sbin/init
 
 # wait for the system to initalize, then run execute.sh
 if [ -n "$DOCKERNETES_DEBUG" ]; then

From 2566f0018608deb034d84c17abaa2faf6b4f9b51 Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Tue, 26 May 2020 12:56:49 -0700
Subject: [PATCH 17/18] wip

---
 end2end/tests/endtoend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/end2end/tests/endtoend.yaml b/end2end/tests/endtoend.yaml
index 8a33a39916..89e0736a2f 100644
--- a/end2end/tests/endtoend.yaml
+++ b/end2end/tests/endtoend.yaml
@@ -16,7 +16,7 @@ spec:
     name: flytetester
     resources:
       requests:
-        cpu: "1"
+        cpu: "0.2"
         memory: 500Mi
   dnsPolicy: ClusterFirst
   priority: 0

From 6ebf4928501db779bd4bed0f1177161a48d35e6b Mon Sep 17 00:00:00 2001
From: Haytham AbuelFutuh <habuelfutuh@lyft.com>
Date: Tue, 26 May 2020 17:22:16 -0700
Subject: [PATCH 18/18] cleanup

---
 end2end/dockernetes_run.sh    | 3 +--
 end2end/execute.sh            | 1 -
 end2end/launch_dockernetes.sh | 1 -
 end2end/print_logs.sh         | 2 --
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/end2end/dockernetes_run.sh b/end2end/dockernetes_run.sh
index d83b65c510..6f05b272e8 100755
--- a/end2end/dockernetes_run.sh
+++ b/end2end/dockernetes_run.sh
@@ -13,8 +13,7 @@ while ! systemctl is-active --quiet multi-user.target; do
     echo "ERROR: timed out waiting for kubernetes to start."
     kubectl get all --all-namespaces
     kubectl describe nodes
-    # exit 1
-    break
+    exit 1
   fi
 done
 
diff --git a/end2end/execute.sh b/end2end/execute.sh
index 380ace7d47..39cd11e4e1 100755
--- a/end2end/execute.sh
+++ b/end2end/execute.sh
@@ -23,7 +23,6 @@ fi
 
 # This is a separate function so that we can potentially reuse in the future when we have more than one test
 function wait_for_flyte_deploys() {
-    df -H
     SECONDS=0
     echo ""
     echo "waiting for flyte deploy to complete..."
diff --git a/end2end/launch_dockernetes.sh b/end2end/launch_dockernetes.sh
index 8c7b65a091..80fb1c8c53 100755
--- a/end2end/launch_dockernetes.sh
+++ b/end2end/launch_dockernetes.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-df -H
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 # stop any existing test container that might be running
diff --git a/end2end/print_logs.sh b/end2end/print_logs.sh
index eb22d0b1f0..0edc301980 100755
--- a/end2end/print_logs.sh
+++ b/end2end/print_logs.sh
@@ -4,8 +4,6 @@ set -ex
 
 df -H
 kubectl get all --all-namespaces
-
-echo "print_logs kubectl describe nodes"
 kubectl describe nodes
 
 function get_flyte_pods() {