From e69018c2b03bcd8a672e3a188a1b6195e2b98e78 Mon Sep 17 00:00:00 2001
From: Brian Cho <brian@aptoslabs.com>
Date: Tue, 9 Jul 2024 11:36:42 -0700
Subject: [PATCH 1/3] Use haproxy 2.9.9

---
 terraform/helm/aptos-node/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/helm/aptos-node/values.yaml b/terraform/helm/aptos-node/values.yaml
index ef2ee7b73fc1f..f112303c1fbdb 100644
--- a/terraform/helm/aptos-node/values.yaml
+++ b/terraform/helm/aptos-node/values.yaml
@@ -34,7 +34,7 @@ haproxy:
     # -- Image repo to use for HAProxy images
     repo: haproxy
     # -- Image tag to use for HAProxy images
-    tag: 2.2.29@sha256:8019a233a37045a27970dbc990e9ea485799200c40f658e4620b7fdf55641a3c
+    tag: 2.9.9@sha256:ef8ceafed9d4e88ec7a3198d18cebdfb3c6a0af134f03ec0eaeda13572b1b262
     # -- Image pull policy to use for HAProxy images
     pullPolicy: IfNotPresent
   resources:

From 76c60a632d058f7f44c1e937ced43e3c364aa5b5 Mon Sep 17 00:00:00 2001
From: Brian Cho <brian@aptoslabs.com>
Date: Tue, 9 Jul 2024 11:40:49 -0700
Subject: [PATCH 2/3] don't run other tests

---
 testsuite/forge-cli/src/main.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/testsuite/forge-cli/src/main.rs b/testsuite/forge-cli/src/main.rs
index ecd38156e4b7d..41deadbdb4ad2 100644
--- a/testsuite/forge-cli/src/main.rs
+++ b/testsuite/forge-cli/src/main.rs
@@ -511,6 +511,11 @@ fn get_test_suite(
         "chaos" => return Ok(chaos_test_suite(duration)),
         _ => {}, // No multi-test suite matches!
     };
+    if let Some(test_suite) = get_land_blocking_test(test_name, duration, test_cmd) {
+        return Ok(test_suite);
+    } else {
+        panic!("skipping everything else")
+    }
 
     // Otherwise, check the test name against the grouped test suites
     if let Some(test_suite) = get_land_blocking_test(test_name, duration, test_cmd) {

From f31c8d7d453140c83244b975717c6abd8ab51617 Mon Sep 17 00:00:00 2001
From: Brian Cho <brian@aptoslabs.com>
Date: Tue, 9 Jul 2024 14:23:49 -0700
Subject: [PATCH 3/3] remove chomp

---
 terraform/helm/aptos-node/templates/haproxy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/helm/aptos-node/templates/haproxy.yaml b/terraform/helm/aptos-node/templates/haproxy.yaml
index 24f5ec8ebd32d..b5ec98c9bd9da 100644
--- a/terraform/helm/aptos-node/templates/haproxy.yaml
+++ b/terraform/helm/aptos-node/templates/haproxy.yaml
@@ -10,7 +10,7 @@ metadata:
   labels:
     {{- include "aptos-validator.labels" $ | nindent 4 }}
 data:
-  haproxy.cfg: |-
+  haproxy.cfg: |
 {{ (tpl ($.Files.Get "files/haproxy.cfg") $) | indent 4 }}
   blocked.ips: ""