Skip to content

Commit fb839c7

Browse files
authored
Functional test logging/startup fixes (#4302)
Enable debug logging for agent by default in our tests. Also fixed a potential startup ready check where the cert-generator job didn't meet the proper condition.
1 parent 4634db2 commit fb839c7

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

tests/README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ make update-firewall-with-local-ip
102102

103103
### Step 2 - Build and Load Images
104104

105-
Loading the images only applies to a `kind` cluster. If using a cloud provider, you will need to tag and push
106-
your images to a registry that is accessible from that cloud provider.
105+
Loading the images only applies to a `kind` cluster. If using GKE, you will need to tag and push
106+
your images to a registry that is accessible from GKE.
107107

108108
```makefile
109109
make build-images load-images TAG=$(whoami)
@@ -115,6 +115,8 @@ Or, to build NGF with NGINX Plus enabled (NGINX Plus cert and key must exist in
115115
make build-images-with-plus load-images-with-plus TAG=$(whoami)
116116
```
117117

118+
When building images to run on GKE, you'll need to specify `GOARCH=amd64` in the build command if your local system doesn't default to that architecture.
119+
118120
For the telemetry test, which requires a OTel collector, build an image with the following variables set:
119121

120122
```makefile
@@ -314,6 +316,8 @@ incremental changes and copy your local changes to the VM to test, you can run
314316
make sync-files-to-vm
315317
```
316318

319+
> Note: if just running longevity tests, skip to the [Longevity section](#longevity-testing).
320+
317321
To set up the GCP environment with the router and VM and then run the tests, run the following command:
318322

319323
```makefile

tests/framework/resourcemanager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ func (rm *ResourceManager) WaitForPodsToBeReady(
488488
var podsReady int
489489
for _, pod := range podList.Items {
490490
for _, cond := range pod.Status.Conditions {
491-
if cond.Type == core.PodReady && cond.Status == core.ConditionTrue {
491+
if cond.Type == core.PodReady && (cond.Status == core.ConditionTrue || cond.Reason == "PodCompleted") {
492492
podsReady++
493493
}
494494
}

tests/suite/system_suite_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ func createNGFInstallConfig(cfg setupConfig, extraInstallArgs ...string) framewo
257257
extraInstallArgs = append(
258258
extraInstallArgs,
259259
"--set", "nginxGateway.config.logging.level=debug",
260+
"--set", "nginx.config.logging.agentLevel=debug",
260261
)
261262
}
262263

0 commit comments

Comments
 (0)