Merge pull request #3600 from uselagoon/testing/fix_dwp_rerun

add CLEAR_API_DATA env to allow API data clearing

Makefile

@@ -71,6 +71,9 @@ PUBLISH_PLATFORM_ARCH := linux/amd64,linux/arm64
 # Skip image scanning by default to make building images substantially faster
 SCAN_IMAGES := false
 
+# Clear all data from the API on a retest run, usually to clear up after a failure. Set false to preserve
+CLEAR_API_DATA ?= true
+
 # Init the file that is used to hold the image tag cross-reference table
 $(shell >build.txt)
 $(shell >scan.txt)
@@ -629,6 +632,7 @@ k3d/retest:
 			LAGOON_FEATURE_FLAG_DEFAULT_ISOLATION_NETWORK_POLICY=enabled \
 			USE_CALICO_CNI=false \
 			LAGOON_FEATURE_FLAG_DEFAULT_ROOTLESS_WORKLOAD=enabled \
+			CLEAR_API_DATA=$(CLEAR_API_DATA) \
 		&& docker run --rm --network host --name ct-$(CI_BUILD_TAG) \
 			--volume "$$(pwd)/test-suite-run.ct.yaml:/etc/ct/ct.yaml" \
 			--volume "$$(pwd):/workdir" \

docker-compose.yaml

@@ -209,6 +209,8 @@ services:
     depends_on:
       - api
     image: ${IMAGE_REPO:-lagoon}/local-api-data-watcher-pusher
+    environment:
+      - CLEAR_API_DATA=false
     volumes:
       - ./local-dev/api-data-watcher-pusher:/home
   local-dbaas-provider:

local-dev/api-data-watcher-pusher/data-init-push.sh

@@ -56,7 +56,10 @@ send_task_data() {
 wait_for_services
 
 # Optionally clear *some* API data prior to reloading - not really necessary any more
-# send_graphql_query $clear_gql_file_path
+if expr "$CLEAR_API_DATA" : '[Tt][Rr][Uu][Ee]' > /dev/null; then
+  echo "Clearing Lagoon data first"
+  send_graphql_query $clear_gql_file_path
+fi
 
 # Create the lagoon-demo project and associated users, groups, deployments, tasks etc
 send_graphql_query $populate_demo_lagoon_gql_file_path