Skip to content

Commit aa690b0

Browse files
Merge pull request #387 from NVIDIA/main
Backport for V0.2.12 release
2 parents 0ad394c + a2a1d65 commit aa690b0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1237
-296
lines changed

.github/workflows/e2e.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ jobs:
2828
e2e-test:
2929
runs-on: linux-amd64-cpu4
3030
if: ${{ github.event.workflow_run.conclusion == 'success' }} && ${{ github.event.workflow_run.event == 'push' }}
31+
strategy:
32+
matrix:
33+
label: [default, legacy, dra, kernel]
34+
name: E2E Test (${{ matrix.label }})
35+
3136
steps:
3237
- name: Checkout code
3338
uses: actions/checkout@v4
@@ -42,9 +47,8 @@ jobs:
4247
run: |
4348
sudo apt-get update
4449
sudo apt-get install -y make
45-
make ginkgo
4650
47-
- name: Run e2e tests
51+
- name: Run e2e test for ${{ matrix.label }}
4852
env:
4953
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
5054
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -55,13 +59,16 @@ jobs:
5559
echo "${{ secrets.AWS_SSH_KEY }}" > "$e2e_ssh_key"
5660
chmod 600 "$e2e_ssh_key"
5761
export E2E_SSH_KEY="$e2e_ssh_key"
58-
59-
make -f tests/Makefile test
62+
if [ "${{ matrix.label }}" = "default" ]; then \
63+
make -f tests/Makefile test GINKGO_ARGS="--label-filter='${{ matrix.label }}' --json-report ginkgo.json"; \
64+
else \
65+
make -f tests/Makefile test GINKGO_ARGS="--label-filter='${{ matrix.label }}'"; \
66+
fi
6067
6168
- name: Archive Ginkgo logs
6269
uses: actions/upload-artifact@v4
6370
with:
64-
name: ginkgo-logs
71+
name: ginkgo-logs-${{ matrix.label }}
6572
path: ginkgo.json
6673
retention-days: 15
6774

.github/workflows/golang.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,14 @@ jobs:
7575
with:
7676
go-version: ${{ needs.variables.outputs.GOLANG_VERSION }}
7777

78-
- run: make coverage
78+
- name: Run unit tests and generate coverage report
79+
run: make coverage
80+
81+
- name: Upload to Coveralls
82+
uses: coverallsapp/github-action@v2
83+
with:
84+
github-token: ${{ secrets.GITHUB_TOKEN }}
85+
file: coverage.out
7986

8087
build:
8188
name: Build

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ test:
8686
go test -coverprofile=$(COVERAGE_FILE) ./pkg/...
8787

8888
coverage: test
89-
cat $(COVERAGE_FILE) | grep -v "_mock.go" > $(COVERAGE_FILE).no-mocks
90-
go tool cover -func=$(COVERAGE_FILE).no-mocks
89+
go tool cover -func=$(COVERAGE_FILE)
9190

9291
mdlint:
9392
${CONTAINER_RUN_CMD} \

README.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Holodeck
22

3-
> * Tech preview, under heavy development *
3+
[![Latest Release](https://img.shields.io/github/v/release/NVIDIA/holodeck?label=latest%20release)](https://github.com/NVIDIA/holodeck/releases/latest)
44

55
A tool for creating and managing GPU-ready Cloud test environments.
66

@@ -13,6 +13,7 @@ A tool for creating and managing GPU-ready Cloud test environments.
1313
- [Commands Reference](docs/commands/)
1414
- [Contributing Guide](docs/contributing/)
1515
- [Examples](docs/examples/)
16+
- [Latest Release](https://github.com/NVIDIA/holodeck/releases/latest)
1617

1718
---
1819

@@ -89,19 +90,11 @@ holodeck status <instance-id>
8990
holodeck dryrun -f ./examples/v1alpha1_environment.yaml
9091
```
9192

92-
---
93-
94-
## 📦 Supported Cuda-Drivers
95-
96-
See [docs/prerequisites.md](docs/prerequisites.md#supported-cuda-drivers) for the full list and usage.
97-
98-
---
99-
10093
## 📂 More
10194

10295
- [Examples](docs/examples/)
10396
- [Guides](docs/guides/)
10497

10598
---
10699

107-
For more information, see the [docs/](docs/) directory.
100+
For more information, see the [documentation](docs/README.md) directory.

docs/README.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Holodeck Documentation
2+
3+
[![Latest Release](https://img.shields.io/github/v/release/NVIDIA/holodeck?label=latest%20release)](https://github.com/NVIDIA/holodeck/releases/latest)
4+
5+
Welcome to the Holodeck documentation! Here you'll find everything you need to
6+
get started, use, and contribute to Holodeck.
7+
8+
## 📚 Sections
9+
10+
- [Quick Start](quick-start.md): Get up and running with Holodeck in minutes.
11+
- [Prerequisites](prerequisites.md): What you need before you begin.
12+
- [Commands Reference](commands/README.md): Detailed documentation for every
13+
Holodeck CLI command.
14+
- [Contributing Guide](contributing/README.md): How to contribute to Holodeck,
15+
including coding standards and PR process.
16+
- [Examples](examples/README.md): Example configuration files and usage scenarios.
17+
- [Guides](guides/README.md): In-depth guides and tutorials for advanced usage.
18+
- [Latest Release](https://github.com/NVIDIA/holodeck/releases/latest)
19+
20+
---
21+
22+
For general information, see the [main README](../README.md).
23+
24+
If you have questions or want to contribute, check out the [Contributing Guide](contributing/README.md)!

docs/examples/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ A sample kind cluster configuration for use with the kind installer.
6767
---
6868

6969
For more details on configuration options, see the
70-
[Command Reference](../commands/) and [Quick Start Guide](../quick-start.md).
70+
[Command Reference](../commands/README.md) and [Quick Start Guide](../quick-start.md).

docs/guides/README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Guides
2+
3+
This section is for in-depth guides and tutorials related to Holodeck.
4+
5+
- If you are looking for step-by-step instructions or advanced usage, guides
6+
will be listed here as they are added.
7+
- To contribute a guide, simply add a new Markdown file to this folder and
8+
update this README with a link.
9+
10+
*No guides are available yet. Stay tuned!*

docs/quick-start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ holodeck delete <instance-id>
7171

7272
- Check out the [Prerequisites](prerequisites.md) for detailed setup
7373
requirements
74-
- Explore the [Command Reference](commands/) for all available commands
74+
- Explore the [Command Reference](commands/README.md) for all available commands
7575
- See [Examples](../examples/) for more complex configurations

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/aws/aws-sdk-go v1.55.7
77
github.com/aws/aws-sdk-go-v2 v1.36.3
88
github.com/aws/aws-sdk-go-v2/config v1.29.14
9-
github.com/aws/aws-sdk-go-v2/service/ec2 v1.222.0
9+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.224.0
1010
github.com/aws/aws-sdk-go-v2/service/ssm v1.59.0
1111
github.com/mattn/go-isatty v0.0.20
1212
github.com/onsi/ginkgo/v2 v2.23.4

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0io
1414
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q=
1515
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
1616
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
17-
github.com/aws/aws-sdk-go-v2/service/ec2 v1.222.0 h1:qPVuEWzRvc/Z8UA0CKG4QczxORbgYTbWwlviUAmVmgs=
18-
github.com/aws/aws-sdk-go-v2/service/ec2 v1.222.0/go.mod h1:ouvGEfHbLaIlWwpDpOVWPWR+YwO0HDv3vm5tYLq8ImY=
17+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.224.0 h1:i7FB/N5pSvEzNOGHm7n6KQiBx2/X8UkrE/Ppb5Bh3QQ=
18+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.224.0/go.mod h1:ouvGEfHbLaIlWwpDpOVWPWR+YwO0HDv3vm5tYLq8ImY=
1919
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE=
2020
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA=
2121
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM=

0 commit comments

Comments
 (0)