From a39652724dbc3c5313bcd5641ee1b6e35342e12b Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Wed, 7 Aug 2019 10:55:15 +0300
Subject: [PATCH] Add confirm and pre rollout hooks to e2e tests

---
 test/e2e-gloo-tests.sh       | 15 ++++++++++++++-
 test/e2e-kubernetes-tests.sh | 10 ++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/test/e2e-gloo-tests.sh b/test/e2e-gloo-tests.sh
index 891d9c53..45c5718e 100755
--- a/test/e2e-gloo-tests.sh
+++ b/test/e2e-gloo-tests.sh
@@ -45,6 +45,7 @@ metadata:
   name: podinfo
   namespace: test
 spec:
+  provider: gloo
   targetRef:
     apiVersion: apps/v1
     kind: Deployment
@@ -62,12 +63,22 @@ spec:
       threshold: 99
       interval: 1m
     webhooks:
+      - name: "gate"
+        type: confirm-rollout
+        url: http://flagger-loadtester.test/gate/approve
+      - name: acceptance-test
+        type: pre-rollout
+        url: http://flagger-loadtester.test/
+        timeout: 10s
+        metadata:
+          type: bash
+          cmd: "curl -sd 'test' http://podinfo-canary:9898/token | grep token"
       - name: load-test
         url: http://flagger-loadtester.test/
         timeout: 5s
         metadata:
           type: cmd
-          cmd: "hey -z 10m -q 10 -c 2 -host app.example.com http://gateway-proxy.gloo-system"
+          cmd: "hey -z 2m -q 5 -c 2 -host app.example.com http://gateway-proxy-v2.gloo-system"
           logCmdOutput: "true"
 EOF
 
@@ -103,7 +114,9 @@ until ${ok}; do
     if [[ ${count} -eq ${retries} ]]; then
         kubectl -n test describe deployment/podinfo
         kubectl -n test describe deployment/podinfo-primary
+        kubectl -n test logs deployment/flagger-loadtester
         kubectl -n gloo-system logs deployment/flagger
+        kubectl -n gloo-system get all
         kubectl -n gloo-system get virtualservice podinfo -oyaml
         echo "No more retries left"
         exit 1
diff --git a/test/e2e-kubernetes-tests.sh b/test/e2e-kubernetes-tests.sh
index d8669f5c..1af7f2af 100755
--- a/test/e2e-kubernetes-tests.sh
+++ b/test/e2e-kubernetes-tests.sh
@@ -46,6 +46,16 @@ spec:
       threshold: 500
       interval: 30s
     webhooks:
+      - name: "gate"
+        type: confirm-rollout
+        url: http://flagger-loadtester.test/gate/approve
+      - name: acceptance-test
+        type: pre-rollout
+        url: http://flagger-loadtester.test/
+        timeout: 10s
+        metadata:
+          type: bash
+          cmd: "curl -sd 'test' http://podinfo-canary:9898/token | grep token"
       - name: load-test
         url: http://flagger-loadtester.test/
         timeout: 5s