Adjusting the B/G e2e tests clean up sequence

Author: schongloo

e2e-tests/test_bluegreen_laststate.sh

@@ -42,8 +42,6 @@ TIMEOUT=300
 #echo "APPLICATION_IDENTIFIER " $APPLICATION_IDENTIFIER
 #echo "BLUE_APPLICATION_IDENTIFIER " $BLUE_APPLICATION_IDENTIFIER
 
-on_exit cleanup_and_exit "$APPLICATION_YAML" $TIMEOUT $BG_CLUSTER_ID
-
 retry_times 5 30 "kubectl apply -f $APPLICATION_YAML" || exit 1
 
 sleep 1
@@ -72,4 +70,9 @@ else
   exit 1
 fi;
 
+echo "Deleting test B/G resources " $BG_CLUSTER_ID
+kubectl delete flinkbluegreendeployments/$BG_CLUSTER_ID &
+echo "Waiting for deployment to be deleted..."
+kubectl wait --for=delete flinkbluegreendeployments/$BG_CLUSTER_ID
+
 echo "Successfully run the Flink Blue/Green Deployments test"

e2e-tests/test_bluegreen_stateless.sh

@@ -37,8 +37,6 @@ BLUE_APPLICATION_IDENTIFIER="flinkdep/$BLUE_CLUSTER_ID"
 GREEN_APPLICATION_IDENTIFIER="flinkdep/$GREEN_CLUSTER_ID"
 TIMEOUT=300
 
-on_exit cleanup_and_exit "$APPLICATION_YAML" $TIMEOUT $BG_CLUSTER_ID
-
 retry_times 5 30 "kubectl apply -f $APPLICATION_YAML" || exit 1
 
 sleep 1
@@ -55,4 +53,9 @@ kubectl wait --for=delete deployment --timeout=${TIMEOUT}s --selector="app=${BLU
 wait_for_status $APPLICATION_IDENTIFIER '.status.jobStatus.state' RUNNING ${TIMEOUT} || exit 1
 wait_for_status $APPLICATION_IDENTIFIER '.status.blueGreenState' ACTIVE_GREEN ${TIMEOUT} || exit 1
 
+echo "Deleting test B/G resources " $BG_CLUSTER_ID
+kubectl delete flinkbluegreendeployments/$BG_CLUSTER_ID &
+echo "Waiting for deployment to be deleted..."
+kubectl wait --for=delete flinkbluegreendeployments/$BG_CLUSTER_ID
+
 echo "Successfully run the Flink Blue/Green Deployments test"