Skip to content

Commit 0ae8c6c

Browse files
[no-relnote] Bump Holodeck to v0.2.15
Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>
1 parent 9ed4489 commit 0ae8c6c

File tree

7 files changed

+347
-383
lines changed

7 files changed

+347
-383
lines changed

.github/workflows/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
go-version: ${{ inputs.golang_version }}
4949

5050
- name: Set up Holodeck
51-
uses: NVIDIA/[email protected].14
51+
uses: NVIDIA/[email protected].15
5252
with:
5353
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
5454
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
File renamed without changes.

tests/e2e/Makefile

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -52,37 +52,3 @@ clean-artifacts:
5252
# Run all tests (default)
5353
test-e2e: ginkgo $(LOG_ARTIFACTS)
5454
$(CURDIR)/bin/ginkgo $(GINKGO_COMMON_ARGS) $(GINKGO_REPORT_ARGS) $(GINKGO_ARGS) ./tests/e2e/...
55-
56-
# Run only parallel-safe tests
57-
test-e2e-parallel: ginkgo $(LOG_ARTIFACTS)
58-
$(CURDIR)/bin/ginkgo $(GINKGO_COMMON_ARGS) $(GINKGO_REPORT_ARGS) \
59-
--procs=$(GINKGO_PARALLEL_PROCS) \
60-
--label-filter='!serial' \
61-
$(GINKGO_ARGS) ./tests/e2e/...
62-
63-
# Run only serial tests (cluster-mutating)
64-
test-e2e-serial: ginkgo $(LOG_ARTIFACTS)
65-
$(CURDIR)/bin/ginkgo $(GINKGO_COMMON_ARGS) $(GINKGO_REPORT_ARGS) \
66-
--label-filter='serial' \
67-
$(GINKGO_ARGS) ./tests/e2e/...
68-
69-
# Run parallel tests first, then serial tests
70-
test-e2e-all: test-e2e-parallel test-e2e-serial
71-
72-
# Run tests with flake attempts
73-
test-e2e-flaky: ginkgo $(LOG_ARTIFACTS)
74-
$(CURDIR)/bin/ginkgo $(GINKGO_COMMON_ARGS) $(GINKGO_REPORT_ARGS) \
75-
--flake-attempts=$(GINKGO_FLAKE_ATTEMPTS) \
76-
$(GINKGO_ARGS) ./tests/e2e/...
77-
78-
# Run specific test by label
79-
test-e2e-label: ginkgo $(LOG_ARTIFACTS)
80-
$(CURDIR)/bin/ginkgo $(GINKGO_COMMON_ARGS) $(GINKGO_REPORT_ARGS) \
81-
--label-filter='$(LABEL)' \
82-
$(GINKGO_ARGS) ./tests/e2e/...
83-
84-
# Run tests and generate coverage
85-
test-e2e-coverage: ginkgo $(LOG_ARTIFACTS)
86-
$(CURDIR)/bin/ginkgo $(GINKGO_COMMON_ARGS) $(GINKGO_REPORT_ARGS) \
87-
--cover --coverprofile=$(LOG_ARTIFACTS)/coverage.out \
88-
$(GINKGO_ARGS) ./tests/e2e/...

tests/e2e/cleanup_test.go

Lines changed: 0 additions & 279 deletions
This file was deleted.

tests/e2e/device-plugin_test.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
* SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,33 +48,30 @@ var _ = Describe("GPU Device Plugin", Ordered, Label("gpu", "e2e", "device-plugi
4848
diagnosticsCollector *diagnostics.Diagnostic
4949
)
5050

51-
defaultCollectorObjects := []string{
51+
collectLogsFrom = []string{
5252
"pods",
5353
"nodes",
5454
"namespaces",
5555
"deployments",
5656
"daemonsets",
5757
"jobs",
5858
}
59+
if CollectLogsFrom != "" && CollectLogsFrom != "default" {
60+
collectLogsFrom = strings.Split(CollectLogsFrom, ",")
61+
}
5962

6063
values := helmValues.Options{
6164
Values: []string{
6265
fmt.Sprintf("image.repository=%s", ImageRepo),
6366
fmt.Sprintf("image.tag=%s", ImageTag),
6467
fmt.Sprintf("image.pullPolicy=%s", ImagePullPolicy),
6568
"devicePlugin.enabled=true",
66-
// We need to make affinity is none if not deploying NFD/GFD
69+
// We need to make affinity null, if not deploying NFD/GFD
6770
// test will fail if not run on a GPU node
6871
"affinity=",
6972
},
7073
}
7174

72-
// check Collector objects
73-
collectLogsFrom = defaultCollectorObjects
74-
if CollectLogsFrom != "" && CollectLogsFrom != "default" {
75-
collectLogsFrom = strings.Split(CollectLogsFrom, ",")
76-
}
77-
7875
BeforeAll(func(ctx SpecContext) {
7976
// Create clients for apiextensions and our CRD api
8077
helmReleaseName = "nvdp-e2e-test-" + randomSuffix()
@@ -97,7 +94,7 @@ var _ = Describe("GPU Device Plugin", Ordered, Label("gpu", "e2e", "device-plugi
9794
// Note: DaemonSet names are dynamically generated with the Helm release prefix,
9895
// so we wait for all DaemonSets in the namespace rather than specific names
9996
By("Waiting for all DaemonSets to be ready")
100-
err = internal.WaitForAllDaemonSetsReady(ctx, clientSet, testNamespace.Name)
97+
err = internal.WaitForDaemonSetsReady(ctx, clientSet, testNamespace.Name, "app.kubernetes.io/name=nvidia-device-plugin")
10198
Expect(err).NotTo(HaveOccurred())
10299
})
103100

0 commit comments

Comments
 (0)