From baff8dd66287eebf6f5d02d36e39195e11a719a0 Mon Sep 17 00:00:00 2001
From: Alexander Apalikov <alexander.apalikov@globant.com>
Date: Thu, 14 May 2020 14:41:50 +0300
Subject: [PATCH] Add E2E tests for Release version of Agones

Run E2E tests with FeatureGates disabled.
---
 build/e2e-image/e2e.sh        |  7 +++++--
 build/e2e-image/entrypoint.sh |  4 ++--
 cloudbuild.yaml               | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/build/e2e-image/e2e.sh b/build/e2e-image/e2e.sh
index 818280ef14..1146d17e33 100755
--- a/build/e2e-image/e2e.sh
+++ b/build/e2e-image/e2e.sh
@@ -13,9 +13,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+FEATURES=$1
+echo $FEATURES
 set -e
 echo "installing current release"
-DOCKER_RUN= make install
+DOCKER_RUN= make install FEATURE_GATES=$FEATURES
 echo "starting e2e test"
-DOCKER_RUN= make test-e2e ARGS=-parallel=64
+DOCKER_RUN= make test-e2e ARGS=-parallel=64 FEATURE_GATES=$FEATURES
 echo "completed e2e test"
\ No newline at end of file
diff --git a/build/e2e-image/entrypoint.sh b/build/e2e-image/entrypoint.sh
index 2b9f5b735c..f480d2ea56 100644
--- a/build/e2e-image/entrypoint.sh
+++ b/build/e2e-image/entrypoint.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 set -e
-
+FEATURES=$1
 export SHELL="/bin/bash"
 export KUBECONFIG="/root/.kube/config"
 mkdir -p /go/src/agones.dev/ /root/.kube/
@@ -30,6 +30,6 @@ kubectl port-forward statefulset/consul 8500:8500 &
 echo "Waiting consul port-forward to launch on 8500..."
 timeout 60 bash -c 'until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done' 127.0.0.1 8500
 echo "consul port-forward launched. Starting e2e tests..."
-consul lock -child-exit-code=true -timeout 30m -try 30m -verbose LockE2E /root/e2e.sh
+consul lock -child-exit-code=true -timeout 30m -try 30m -verbose LockE2E '/root/e2e.sh $FEATURES'
 killall -q kubectl || true
 echo "successfully killed kubectl proxy"
\ No newline at end of file
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 48e11fc4c1..bb9d3ff945 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -227,14 +227,26 @@ steps:
     - GO111MODULE=on
 
 #
-# Run the e2e tests
+# Run the e2e tests with FeatureGates
 #
 
 - name: 'e2e-runner'
+  args: ['PlayerTracking=true&ContainerPortAllocation=true']
   waitFor:
     - push-images
     - build-e2e
 
+#
+# Run the e2e tests without FeatureGates
+#
+
+- name: 'e2e-runner-release'
+  args: ['']
+  waitFor:
+    - e2e-runner
+    - push-images
+    - build-e2e
+
 #
 # SDK conformance tests
 #