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

Jump to bottom

Lower upstream count for scale nfr test with nginx plus #2695

Merged
merged 3 commits into from
Oct 16, 2024
+11 −5
Merged

Lower upstream count for scale nfr test with nginx plus #2695

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
72afb50
Adjust nfr scale test to lower upstream count for nginx plus
bjee19 Oct 16, 2024
75d199d
Add small change
bjee19 Oct 16, 2024
1a13b42
Add readme changes
bjee19 Oct 16, 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
8 changes: 7 additions & 1 deletion tests/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ required env vars. `GKE_SVC_ACCOUNT` needs to be the name of a service account t

In order to run the tests in GCP, you need a few things:

- GKE router to allow egress traffic (used by upgrade tests for pulling images from Github)
- GKE router to allow egress traffic (used by upgrade tests for pulling images from Github, and scale/reconfig tests for installing prometheus)
- this assumes that your GKE cluster is using private nodes. If using public nodes, you don't need this.
- GCP VM and firewall rule to send ingress traffic to GKE

Expand All @@ -286,6 +286,12 @@ To just set up the VM with no router (this will not run the tests):
make create-and-setup-vm
```

To set up just the router:

```makefile
make create-gke-router
```

Otherwise, you can set up the VM, router, and run the tests with a single command. See the options below.

By default, the tests run using the version of NGF that was `git cloned` during the setup. If you want to make
Expand Down
8 changes: 4 additions & 4 deletions tests/suite/scale_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var _ = Describe("Scale test", Ordered, Label("nfr", "scale"), func() {
httpsListenerCount = 64
httpRouteCount = 1000
ossUpstreamServerCount = 648
plusUpstreamServerCount = 556
plusUpstreamServerCount = 545
)

BeforeAll(func() {
Expand Down Expand Up @@ -441,7 +441,7 @@ The logs are attached only if there are errors.

Eventually(
framework.CreateResponseChecker(url, address, timeoutConfig.RequestTimeout),
).WithTimeout(30 * time.Second).WithPolling(100 * time.Millisecond).Should(Succeed())
).WithTimeout(5 * timeoutConfig.RequestTimeout).WithPolling(100 * time.Millisecond).Should(Succeed())

ttr := time.Since(startCheck)

Expand Down Expand Up @@ -475,7 +475,7 @@ The logs are attached only if there are errors.

Eventually(
framework.CreateResponseChecker(url, address, timeoutConfig.RequestTimeout),
).WithTimeout(5 * time.Second).WithPolling(100 * time.Millisecond).Should(Succeed())
).WithTimeout(5 * timeoutConfig.RequestTimeout).WithPolling(100 * time.Millisecond).Should(Succeed())

Expect(
resourceManager.ScaleDeployment(namespace, "backend", upstreamServerCount),
Expand All @@ -488,7 +488,7 @@ The logs are attached only if there are errors.

Eventually(
framework.CreateResponseChecker(url, address, timeoutConfig.RequestTimeout),
).WithTimeout(5 * time.Second).WithPolling(100 * time.Millisecond).Should(Succeed())
).WithTimeout(5 * timeoutConfig.RequestTimeout).WithPolling(100 * time.Millisecond).Should(Succeed())
}

setNamespace := func(objects framework.ScaleObjects) {
Expand Down
Loading