Skip to content

Commit a3e371b

Browse files
shivakunvshivakunv
committed
ubuntu24.04 ci pipeline fix
ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]>
1 parent 0a86527 commit a3e371b

File tree

15 files changed

+139
-38
lines changed

15 files changed

+139
-38
lines changed

‎.common-ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@ trigger-pipeline:
7373
.driver-versions:
7474
parallel:
7575
matrix:
76-
- DRIVER_VERSION: [535.216.01, 550.127.05]
76+
- DRIVER_VERSION: [535.216.01, 550.127.05, 565.57.01]
7777

7878
# Define the driver versions for jobs that can be run in parallel for ubuntu24.04
7979
.driver-versions-ubuntu24.04:
8080
parallel:
8181
matrix:
82-
- DRIVER_VERSION: [535.216.01, 550.127.05]
82+
- DRIVER_VERSION: [535.216.01, 550.127.05, 565.57.01]
8383

8484
# Define the matrix of precompiled jobs that can be run in parallel for ubuntu22.04
8585
.driver-versions-precompiled-ubuntu22.04:
8686
parallel:
8787
matrix:
88-
- DRIVER_BRANCH: [535, 550]
88+
- DRIVER_BRANCH: [535, 550, 565]
8989
KERNEL_FLAVOR: [aws, azure, generic, nvidia, oracle]
9090

9191
# Define the distribution targets

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
4141
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
4242
aws_ssh_key: ${{ secrets.AWS_SSH_KEY }}
43-
holodeck_config: "tests/holodeck.yaml"
43+
holodeck_config: "tests/holodeck_ubuntu22.04.yaml"
4444

4545
- name: Get public dns name
4646
id: get_public_dns_name

‎.github/workflows/image.yaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ on:
2121
- opened
2222
- synchronize
2323
branches:
24-
- main
25-
- release-*
24+
- main-no
2625
push:
2726
branches:
28-
- main
29-
- release-*
27+
- main-no
3028

3129
jobs:
3230
image:
@@ -91,6 +89,7 @@ jobs:
9189
IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/driver
9290
VERSION: ${COMMIT_SHORT_SHA}
9391
run: |
92+
echo "DRIVER_VERSIONS=${{ matrix.driver }} make build-${{ matrix.dist }}-${{ matrix.driver }}"
9493
DRIVER_VERSIONS=${{ matrix.driver }} make build-${{ matrix.dist }}-${{ matrix.driver }}
9594
9695
pre-compiled:
@@ -156,6 +155,7 @@ jobs:
156155
VERSION: ${COMMIT_SHORT_SHA}
157156
BASE_TARGET: jammy
158157
run: |
158+
echo "make DRIVER_BRANCH=${{ matrix.driver }} KERNEL_FLAVOR=${{ matrix.flavor }} build-base-${BASE_TARGET}"
159159
make DRIVER_BRANCH=${{ matrix.driver }} KERNEL_FLAVOR=${{ matrix.flavor }} build-base-${BASE_TARGET}
160160
161161
trap "docker rm -f base-${BASE_TARGET}-${{ matrix.flavor }}" EXIT
@@ -172,5 +172,6 @@ jobs:
172172
PRECOMPILED: "true"
173173
DIST: signed_ubuntu22.04
174174
run: |
175-
source kernel_version.txt && \
175+
source kernel_version.txt
176+
echo "make DRIVER_VERSIONS=${DRIVER_VERSIONS} DRIVER_BRANCH=${{ matrix.driver }} build-${DIST}-${DRIVER_VERSION}"
176177
make DRIVER_VERSIONS=${DRIVER_VERSIONS} DRIVER_BRANCH=${{ matrix.driver }} build-${DIST}-${DRIVER_VERSION}

‎.github/workflows/precompiled.yaml‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,20 @@
1515
# Run this workflow on a schedule
1616
name: Precompiled images
1717

18+
# on:
19+
# schedule:
20+
# - cron: '00 09 * * *' # scheduled job
21+
1822
on:
19-
schedule:
20-
- cron: '00 09 * * *'
23+
pull_request:
24+
types:
25+
- opened
26+
- synchronize
27+
branches:
28+
- ci-precompile-ubuntu24.04
29+
push:
30+
branches:
31+
- ci-precompile-ubuntu24.04
2132

2233
jobs:
2334
set-driver-version-matrix:
@@ -33,17 +44,24 @@ jobs:
3344
id: extract_driver_branch
3445
run: |
3546
# get driver_branch
36-
DRIVER_BRANCH=("535" "550")
47+
# DRIVER_BRANCH=("535" "550" "565")
48+
# DRIVER_BRANCH=("535" "550")
49+
DRIVER_BRANCH=("550")
3750
driver_branch_json=$(printf '%s\n' "${DRIVER_BRANCH[@]}" | jq -R . | jq -cs .)
3851
echo "driver_branch=$driver_branch_json" >> $GITHUB_OUTPUT
3952
4053
# get kernel flavors
41-
KERNEL_FLAVORS=("aws" "azure" "generic" "nvidia" "oracle")
54+
# KERNEL_FLAVORS=("aws" "azure" "generic" "nvidia" "oracle")
55+
# KERNEL_FLAVORS=("azure" "generic" "nvidia" "oracle")
56+
# KERNEL_FLAVORS=("aws")
57+
KERNEL_FLAVORS=("generic")
4258
kernel_flavors_json=$(printf '%s\n' "${KERNEL_FLAVORS[@]}" | jq -R . | jq -cs .)
4359
echo "kernel_flavors=$kernel_flavors_json" >> $GITHUB_OUTPUT
4460
4561
# get ubuntu distributions
46-
DIST=("ubuntu22.04")
62+
# DIST=("ubuntu22.04" "ubuntu24.04")
63+
# DIST=("ubuntu22.04")
64+
DIST=("ubuntu24.04")
4765
dist_json=$(printf '%s\n' "${DIST[@]}" | jq -R . | jq -cs .)
4866
echo "dist=$dist_json" >> $GITHUB_OUTPUT
4967
@@ -201,7 +219,7 @@ jobs:
201219
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
202220
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
203221
aws_ssh_key: ${{ secrets.AWS_SSH_KEY }}
204-
holodeck_config: "tests/holodeck.yaml"
222+
holodeck_config: "tests/holodeck_${{ matrix.dist }}.yaml"
205223

206224
- name: Get public dns name
207225
id: get_public_dns_name
@@ -296,7 +314,7 @@ jobs:
296314
matrix:
297315
driver_branch: ${{ fromJson(needs.set-driver-version-matrix.outputs.driver_branch) }}
298316
kernel_version: ${{ fromJson(needs.determine-e2e-test-matrix.outputs.matrix_values) }}
299-
dist: ${{ fromJson(needs.set-driver-version-matrix.outputs.dist) }}
317+
dist: ${{ fromJson(needs.set-driver-version-matrix.outputs.dist) }}
300318
steps:
301319
- name: Check out code
302320
uses: actions/checkout@v4

‎.nvidia-ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@ sign:ngc-ubuntu-rhel-rhcos:
463463
matrix:
464464
- SIGN_JOB_NAME: ["ubuntu"]
465465
VERSION: ["24.04"]
466+
DRIVER_VERSION: ["535.216.01", "550.127.05", "565.57.01"]
466467
- SIGN_JOB_NAME: ["ubuntu"]
467468
VERSION: ["22.04"]
468469
DRIVER_VERSION: ["535.216.01", "550.127.05", "565.57.01"]

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(OUT_DIST)
5454
OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
5555

5656
##### Public rules #####
57-
DISTRIBUTIONS := ubuntu18.04 ubuntu20.04 ubuntu22.04 ubuntu24.04 signed_ubuntu20.04 signed_ubuntu22.04 rhel8 rhel9 flatcar fedora36 sles15.3 precompiled_rhcos
57+
DISTRIBUTIONS := ubuntu18.04 ubuntu20.04 ubuntu22.04 ubuntu24.04 signed_ubuntu24.04 signed_ubuntu20.04 signed_ubuntu22.04 rhel8 rhel9 flatcar fedora36 sles15.3 precompiled_rhcos
5858
PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))
5959
BASE_FROM := jammy focal
6060
PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))

‎base/generate-ci-config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ DRIVER_VERSION=$(apt-cache show nvidia-utils-${DRIVER_BRANCH}-server |grep Versi
2424
# Latest supported kernel
2525
SK=$(echo $SUPPORTED_KERNELS | awk '{print $NF}')
2626

27+
# SHIVA
28+
#SK=$(echo $SUPPORTED_KERNELS | awk '{print $(NF-1)}')
29+
2730
# Write to file
2831
echo "export KERNEL_VERSION=$SK DRIVER_VERSION=$DRIVER_VERSION DRIVER_VERSIONS=$DRIVER_VERSION" > /var/kernel_version.txt
2932
echo "KERNEL_VERSION=$SK DRIVER_VERSION=$DRIVER_VERSION DRIVER_VERSIONS=$DRIVER_VERSION"

‎tests/cases/nvidia-driver.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ fi
88

99
# export gpu-operator options
1010
export TEST_CASE_ARGS="$1"
11+
echo "uploading image SHIVA $2"
1112
if [[ $# -eq 2 ]]; then
1213
export IMAGE_PATH="$2"
14+
echo "uploading image SHIVA 1"
1315
sudo ctr -n k8s.io images import "$IMAGE_PATH"
16+
echo "uploading image SHIVA 2"
1417
fi
1518

1619
SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../scripts && pwd )"

‎tests/holodeck.yaml‎ renamed to ‎tests/holodeck_ubuntu22.04.yaml‎

File renamed without changes.

‎tests/holodeck_ubuntu24.04.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
apiVersion: holodeck.nvidia.com/v1alpha1
2+
kind: Environment
3+
metadata:
4+
name: HOLODECK_NAME
5+
description: "end-to-end test infrastructure"
6+
spec:
7+
provider: aws
8+
auth:
9+
keyName: cnt-ci
10+
privateKey: HOLODECK_PRIVATE_KEY
11+
instance:
12+
type: g4dn.xlarge
13+
region: us-west-1
14+
ingressIpRanges:
15+
- 18.190.12.32/32
16+
- 3.143.46.93/32
17+
- 52.15.119.136/32
18+
- 35.155.108.162/32
19+
- 35.162.190.51/32
20+
- 54.201.61.24/32
21+
image:
22+
architecture: amd64
23+
imageId: ami-0da424eb883458071
24+
containerRuntime:
25+
install: true
26+
name: containerd
27+
version: 1.6.24
28+
kubernetes:
29+
install: true
30+
installer: kubeadm
31+
version: v1.30.0
32+
crictlVersion: v1.30.0

0 commit comments

Comments
 (0)