Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use haproxy 2.9.9 #13954

Closed
wants to merge 3 commits into from
Closed

Use haproxy 2.9.9 #13954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e69018c
Use haproxy 2.9.9
bchocho Jul 9, 2024
76c60a6
don't run other tests
bchocho Jul 9, 2024
f31c8d7
remove chomp
bchocho Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion terraform/helm/aptos-node/templates/haproxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""

Expand Down
2 changes: 1 addition & 1 deletion terraform/helm/aptos-node/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions testsuite/forge-cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading