Skip to content

Commit f151a94

Browse files
committed
Run pipeline
1 parent 21449dd commit f151a94

File tree

4 files changed

+29
-19
lines changed

4 files changed

+29
-19
lines changed

tests/suite/graceful_recovery_test.go

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
6565
return nil
6666
}
6767

68-
//var ngfPodName string
68+
// var ngfPodName string
6969

7070
BeforeEach(func() {
7171
// this test is unique in that it will check the entire log of both ngf and nginx containers
@@ -89,7 +89,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
8989
Expect(resourceManager.Apply([]client.Object{&ns})).To(Succeed())
9090
Expect(resourceManager.ApplyFromFiles(files, ns.Name)).To(Succeed())
9191
Expect(resourceManager.WaitForAppsToBeReady(ns.Name)).To(Succeed())
92-
//Expect(resourceManager.WaitForAppsToBeReadyWithPodCount(ns.Name, 2)).To(Succeed())
92+
// Expect(resourceManager.WaitForAppsToBeReadyWithPodCount(ns.Name, 2)).To(Succeed())
9393

9494
nginxPodNames, err := framework.GetReadyNginxPodNames(k8sClient, ns.Name, timeoutConfig.GetTimeout)
9595
Expect(err).ToNot(HaveOccurred())
@@ -256,7 +256,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
256256

257257
Expect(resourceManager.ApplyFromFiles(files, ns.Name)).To(Succeed())
258258
Expect(resourceManager.WaitForAppsToBeReady(ns.Name)).To(Succeed())
259-
//Expect(resourceManager.WaitForAppsToBeReadyWithPodCount(ns.Name, 2)).To(Succeed())
259+
// Expect(resourceManager.WaitForAppsToBeReadyWithPodCount(ns.Name, 2)).To(Succeed())
260260

261261
var nginxPodNames []string
262262
var err error
@@ -286,7 +286,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
286286
// When the NGINX process is killed, some errors are expected in the NGF logs while we wait for the
287287
// NGINX container to be restarted. Therefore, we don't want to check the NGF logs for errors when the container
288288
// we restarted was NGINX.
289-
//if containerName != nginxContainerName {
289+
// if containerName != nginxContainerName {
290290
// checkNGFContainerLogsForErrors(ngfPodName)
291291
//}
292292
}
@@ -370,7 +370,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
370370
setUpPortForward(nginxPodName, ns.Name)
371371

372372
checkNGFFunctionality(teaURL, coffeeURL, ngfPodName, "", files, ns)
373-
//if errorLogs := getUnexpectedNginxErrorLogs(ngfPodName, ns.Name); errorLogs != "" {
373+
// if errorLogs := getUnexpectedNginxErrorLogs(ngfPodName, ns.Name); errorLogs != "" {
374374
// Skip(fmt.Sprintf("NGINX has unexpected error logs: \n%s", errorLogs))
375375
//}
376376
}
@@ -384,7 +384,6 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
384384
}
385385

386386
It("recovers when nginx container is restarted", func() {
387-
388387
nginxPodNames, err := framework.GetReadyNginxPodNames(k8sClient, ns.Name, timeoutConfig.GetTimeout)
389388
Expect(err).ToNot(HaveOccurred())
390389
Expect(nginxPodNames).To(HaveLen(1))
@@ -400,14 +399,18 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
400399
setUpPortForward(nginxPodNames[0], ns.Name)
401400

402401
checkNGFFunctionality(teaURL, coffeeURL, nginxPodName, nginxContainerName, files, &ns)
403-
//if errorLogs := getUnexpectedNginxErrorLogs(nginxPodName, ns.Name); errorLogs != "" {
402+
// if errorLogs := getUnexpectedNginxErrorLogs(nginxPodName, ns.Name); errorLogs != "" {
404403
// Skip(fmt.Sprintf("NGINX has unexpected error logs: \n%s", errorLogs))
405404
//}
406405
})
407406

408407
It("recovers when NGF Pod is restarted", func() {
409-
410-
startingNGFPodNames, err := framework.GetReadyNGFPodNames(k8sClient, ngfNamespace, releaseName, timeoutConfig.GetTimeout)
408+
startingNGFPodNames, err := framework.GetReadyNGFPodNames(
409+
k8sClient,
410+
ngfNamespace,
411+
releaseName,
412+
timeoutConfig.GetTimeout,
413+
)
411414
Expect(err).ToNot(HaveOccurred())
412415
Expect(startingNGFPodNames).To(HaveLen(1))
413416

@@ -422,7 +425,12 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
422425
var newNGFPodNames []string
423426
Eventually(
424427
func() bool {
425-
newNGFPodNames, err = framework.GetReadyNGFPodNames(k8sClient, ngfNamespace, releaseName, timeoutConfig.GetStatusTimeout)
428+
newNGFPodNames, err = framework.GetReadyNGFPodNames(
429+
k8sClient,
430+
ngfNamespace,
431+
releaseName,
432+
timeoutConfig.GetStatusTimeout,
433+
)
426434
return len(newNGFPodNames) == 1 && err == nil
427435
}).
428436
WithTimeout(timeoutConfig.CreateTimeout * 2).
@@ -436,7 +444,6 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
436444
Expect(newNGFPodName).ToNot(Equal(startingNGFPodNames[0]))
437445

438446
checkNGFFunctionality(teaURL, coffeeURL, newNGFPodName, "", files, &ns)
439-
440447
})
441448

442449
It("recovers when drained node is restarted", func() {
@@ -448,7 +455,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
448455
})
449456
})
450457

451-
//func runRecoveryTest(teaURL, coffeeURL, ngfPodName, containerName string, files []string, ns *core.Namespace) {
458+
// func runRecoveryTest(teaURL, coffeeURL, ngfPodName, containerName string, files []string, ns *core.Namespace) {
452459
// var (
453460
// err error
454461
// leaseName string

tests/suite/system_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ func getDefaultSetupCfg() setupConfig {
304304
chartPath: localChartPath,
305305
gwAPIVersion: *gatewayAPIVersion,
306306
deploy: true,
307-
debugLogLevel: false,
307+
debugLogLevel: true,
308308
}
309309
}
310310

@@ -321,7 +321,7 @@ var _ = BeforeSuite(func() {
321321
"telemetry", // - running telemetry test (NGF will be deployed as part of the test)
322322
"scale", // - running scale test (this test will deploy its own version)
323323
"reconfiguration", // - running reconfiguration test (test will deploy its own instances)
324-
//"graceful-recovery",
324+
// "graceful-recovery",
325325
}
326326
for _, s := range skipSubstrings {
327327
if strings.Contains(labelFilter, s) {

tests/suite/telemetry_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ import (
1111
"github.com/nginx/nginx-gateway-fabric/tests/framework"
1212
)
1313

14-
// TELEMETRY_ENDPOINT_INSECURE = true.
1514
var _ = Describe("Telemetry test with OTel collector", Label("telemetry"), func() {
15+
// To run the tracing test, you must build NGF with the following values:
16+
// TELEMETRY_ENDPOINT=otel-collector-opentelemetry-collector.collector.svc.cluster.local:4317
17+
// TELEMETRY_ENDPOINT_INSECURE = true
18+
1619
BeforeEach(func() {
1720
// Because NGF reports telemetry on start, we need to install the collector first.
1821

tests/suite/upgrade_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ var _ = Describe("Upgrade testing", Label("nfr", "upgrade"), func() {
4949

5050
cfg := setupConfig{
5151
releaseName: releaseName,
52-
//chartPath: "oci://ghcr.io/nginx/charts/nginx-gateway-fabric",
52+
// chartPath: "oci://ghcr.io/nginx/charts/nginx-gateway-fabric",
5353
gwAPIVersion: *gatewayAPIPrevVersion,
5454
deploy: true,
5555
nfr: true,
5656
debugLogLevel: true,
5757
}
5858

59-
//cfg := getDefaultSetupCfg()
60-
//cfg.gwAPIVersion = *gatewayAPIPrevVersion
61-
//cfg.nfr = true
59+
// cfg := getDefaultSetupCfg()
60+
// cfg.gwAPIVersion = *gatewayAPIPrevVersion
61+
// cfg.nfr = true
6262

6363
setup(cfg, "--values", valuesFile)
6464

0 commit comments

Comments
 (0)