Welcome back auto/

TykTechnologies · Nov 16, 2023 · 5b33435 · 5b33435
1 parent 1b9deae
commit 5b33435
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 6 deletions.
diff --git a/auto/local-postgres15.env b/auto/local-postgres15.env
@@ -3,8 +3,8 @@ TYK_DB_STORAGE_MAIN_TABLESHARDING=true
 TYK_DB_STORAGE_MAIN_TYPE=postgres
 TYK_GW_HASHKEYFUNCTION=murmur64
 TYK_GW_HASHKEYS=true
-TYK_GW_SLAVEOPTIONS_APIKEY=<PLACEHOLDER>
-TYK_GW_SLAVEOPTIONS_RPCKEY=<PLACEHOLDER>
+TYK_GW_SLAVEOPTIONS_APIKEY=b3e8c46da8814c3b4208c5a57325a24b
+TYK_GW_SLAVEOPTIONS_RPCKEY=64ff5ccfd18d530001495fbe
 TYK_LOGLEVEL=debug
 TYK_MDCB_ANALYTICSCONFIG_CONNECTIONSTRING="user=postgres database=tyk_analytics host=postgres port=5432"
 TYK_MDCB_ANALYTICSCONFIG_TYPE=postgres

diff --git a/auto/master.env b/auto/master.env
@@ -8,5 +8,5 @@ tyk_beta_image=${registry}/tyk:master
 pull_policy=never
 confs_dir=./pro
 env_file=local-mongo44.env
-TYK_DB_LICENSEKEY=<PLACEHOLDER>
-TYK_MDCB_LICENSE=<PLACEHOLDER>
+TYK_DB_LICENSEKEY=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhbGxvd2VkX25vZGVzIjoiNTA2ZjMwYjgtYzI5Mi00YmMwLTY2ZGYtMzRhYzRmNzY1ZDA4LDMxNjQyZTY3LTRlYzMtNDMwNS00MzRhLWFkZWM4MjVjODkzMyw5NWQ3OTYzMi02ZmU3LTRlMzEtNDA4Yi04Y2EyMzY2MjM3MjAsZmMxZTIwZTAtYjVhNC00ZWZkLTQ3MDgtYmZkY2JjZTU5OWVhLGM1YTQwOWM5LWNlNWMtNDE4My03OGFjLThlOTdhMzQ5YWM5YSw1NThhODdmYi0wNTliLTQ3MTktNWVlMy0zNTE5YmM1YjUwNjAsZjFlMzc3ODgtODMzZS00YWIxLTU1YWItY2RkYzVlY2JkNWVlLDdjMmM3Njc4LTA5MjYtNDRiOS00MzViLTYyYWI1MzlkZDZkMSw2MDBkMjFmYS1lOTYxLTQ2ZTUtNDQyYi1mZTdhM2M0MjRjZDQsZjA5NzhjYzctOTM3MS00NDA5LTQ0ODItMmIzZmJlZWUwODkzIiwiZXhwIjoxNjk2MjkxMTk5LCJpYXQiOjE2OTM2MjM0MjksIm93bmVyIjoiNjFjY2U2MmMxMjFjYTEwMDAxOGJiMTkwIiwic2NvcGUiOiJtdWx0aV90ZWFtLHJiYWMsZ3JhcGgsZmVkZXJhdGlvbiIsInYiOiIyIn0.Jy4SyBX9jhHDx1K0Ex0LUdbbL-W58DN4lhsRSIdaj3IK04SonzyYbqDuNKEHjaysDCf34EgFWK9wc2s2UPNn9gAyjuYs6xhFYP12us_IuL8ILkNztLCC8S86fdf63SuetxpkYHXybHZ-26GHBaBErPjPuuzK_xPJAJar50_JZDqgGcOvR8MhQ5QeqJT-wqiojXJUuiyVowJYxU4a1r1RpiOanCDIakTxNn-PSHQfhoZKykG4Bt0URT_fVJrKwAR61sYFERxBqG-TwQIrV2IUy1QVs23-XseCkdu-MwmeeVDZsm6udHrRBJfHRg6ye8LypQbawUWZun1EtSD-7XiWMA
+TYK_MDCB_LICENSE=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJTS1UiOiJUeWstTURDQi1FTlQiLCJleHAiOjE2OTYyOTExOTksIm93bmVyIjoiNjFjY2U2MmMxMjFjYTEwMDAxOGJiMTkwIn0.x4HQddZG3m-xSpeBxwZYiDu4yAse2e6EFwOsZv1_FM6UI6EgyjXR50ey2U7ksse4scuMpkAxrMiLoqodg1hNkrOVWs5Li5Odl3akyZ6iLinqp91VLRRStjYODU5GUuuV-3iRZbSl8p4NqM8_s-rCPDYS2vtqoJz8PiJBxqqEhKLQB0h9eAj_UbpL6xQU3vMaSnSNRKq3hjsWeLJmNiKsnIwD59mMEIW5tzhkrfYiPH4yTVTjouCQVqfQa3MVmssPZ-Sh6WexviF36Kl3e6hseifghBnJzEHepp1flCtlCL7SnyN7D155JdZHdSTds13gM8njSOdEcaXYNwfi_J1QIA
diff --git a/auto/pro-ha.yml b/auto/pro-ha.yml
@@ -168,7 +168,73 @@ services:
       start_period: 10s
       timeout: 10s
 
-  wait:
+  gateway-checker-1a:
+    profiles: ["all", "slave-datacenter"]
+    image: curlimages/curl
+    command: tail -f /dev/null
+    depends_on:
+      - tyk-gateway-datacenter-1-alfa
+    healthcheck:
+      test: curl -s -k --fail https://tyk-gateway-datacenter-1-alfa:8181/hello | grep -o '.*status":"pass".*redis":{"status":"pass".*rpc":{"status":"pass"'
+      interval: 5s
+      retries: 10
+      start_period: 4s
+      timeout: 10s
+
+  gateway-checker-1b:
+    profiles: ["all", "slave-datacenter"]
+    image: curlimages/curl
+    command: tail -f /dev/null
+    depends_on:
+      - tyk-gateway-datacenter-1-beta
+    healthcheck:
+      test: curl -s -k --fail https://tyk-gateway-datacenter-1-beta:8182/hello | grep -o '.*status":"pass".*redis":{"status":"pass".*rpc":{"status":"pass"'
+      interval: 5s
+      retries: 10
+      start_period: 4s
+      timeout: 10s
+
+  gateway-checker-2a:
+    profiles: ["all", "slave-datacenter"]
+    image: curlimages/curl
+    command: tail -f /dev/null
+    depends_on:
+      - tyk-gateway-datacenter-2-alfa
+    healthcheck:
+      test: curl -s -k --fail https://tyk-gateway-datacenter-2-alfa:8281/hello | grep -o '.*status":"pass".*redis":{"status":"pass".*rpc":{"status":"pass"'
+      interval: 5s
+      retries: 10
+      start_period: 4s
+      timeout: 10s
+
+  gateway-checker-2b:
+    profiles: ["all", "slave-datacenter"]
+    image: curlimages/curl
+    command: tail -f /dev/null
+    depends_on:
+      - tyk-gateway-datacenter-2-beta
+    healthcheck:
+      test: curl -s -k --fail https://tyk-gateway-datacenter-2-beta:8282/hello | grep -o '.*status":"pass".*redis":{"status":"pass".*rpc":{"status":"pass"'
+      interval: 5s
+      retries: 10
+      start_period: 4s
+      timeout: 10s
+
+  wait_tyk_slaves:
+    profiles: ["all", "slave-datacenter"]
+    image: hello-world:linux
+    depends_on:
+        gateway-checker-1a:
+            condition: service_healthy
+        gateway-checker-1b:
+            condition: service_healthy 
+        gateway-checker-2a:
+            condition: service_healthy
+        gateway-checker-2b:
+            condition: service_healthy 
+
+
+  wait_tyk_components:
     profiles: ["all", "master-datacenter"]
     image: hello-world:linux
     depends_on:

diff --git a/auto/pytest.env b/auto/pytest.env
@@ -1 +1 @@
-USER_API_SECRET=e888cc45c7ec43615980e85612dd1f15
+USER_API_SECRET=b3e8c46da8814c3b4208c5a57325a24b
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		USER_API_SECRET=e888cc45c7ec43615980e85612dd1f15
		USER_API_SECRET=b3e8c46da8814c3b4208c5a57325a24b