Skip to content

Commit 0f1adeb

Browse files
committed
dynamic holodeck ci instance name
Signed-off-by: shiva kumar <[email protected]>
1 parent e49821d commit 0f1adeb

File tree

5 files changed

+35
-20
lines changed

5 files changed

+35
-20
lines changed

.github/workflows/image.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ on:
2121
- opened
2222
- synchronize
2323
branches:
24-
- main
25-
- release-*
24+
- main-no
25+
- release-no
2626
push:
2727
branches:
28-
- main
29-
- release-*
28+
- main-no
29+
- release-no
3030

3131
jobs:
3232
image:

.github/workflows/precompiled.yaml

+27-6
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+
- holodeckname
29+
push:
30+
branches:
31+
- holodeckname
2132

2233
jobs:
2334
set-driver-version-matrix:
@@ -37,17 +48,20 @@ jobs:
3748
id: extract_driver_branch
3849
run: |
3950
# get driver_branch
40-
DRIVER_BRANCH=("535" "550")
51+
# DRIVER_BRANCH=("535" "550")
52+
DRIVER_BRANCH=("550")
4153
driver_branch_json=$(printf '%s\n' "${DRIVER_BRANCH[@]}" | jq -R . | jq -cs .)
4254
echo "driver_branch=$driver_branch_json" >> $GITHUB_OUTPUT
4355
4456
# get kernel flavors
45-
KERNEL_FLAVORS=("aws" "azure" "generic" "nvidia" "oracle")
57+
# KERNEL_FLAVORS=("aws" "azure" "generic" "nvidia" "oracle")
58+
KERNEL_FLAVORS=("generic")
4659
kernel_flavors_json=$(printf '%s\n' "${KERNEL_FLAVORS[@]}" | jq -R . | jq -cs .)
4760
echo "kernel_flavors=$kernel_flavors_json" >> $GITHUB_OUTPUT
4861
4962
# get ubuntu distributions
50-
DIST=("ubuntu22.04" "ubuntu24.04")
63+
# DIST=("ubuntu22.04" "ubuntu24.04")
64+
DIST=("ubuntu22.04")
5165
dist_json=$(printf '%s\n' "${DIST[@]}" | jq -R . | jq -cs .)
5266
echo "dist=$dist_json" >> $GITHUB_OUTPUT
5367
@@ -296,14 +310,21 @@ jobs:
296310
driver_branch_json="${{ needs.set-driver-version-matrix.outputs.driver_branch }}"
297311
DRIVER_BRANCHES=($(echo "$driver_branch_json" | jq -r '.[]'))
298312
echo "DRIVER_BRANCHES=${DRIVER_BRANCHES[*]}" >> $GITHUB_ENV
313+
REPO_NAME=${GITHUB_REPOSITORY##*/}
314+
echo "REPO_NAME=${REPO_NAME}" >> $GITHUB_ENV
315+
echo "BRANCH_NAME=${GITHUB_REF_NAME}" >> $GITHUB_ENV
316+
echo "GITHUB_ACTOR=${GITHUB_ACTOR}" >> $GITHUB_ENV
317+
echo "INSTANCE_NAME=${REPO_NAME}-${GITHUB_REF_NAME}-${GITHUB_ACTOR}-${GITHUB_SHA:0:8}" >> $GITHUB_ENV
318+
echo "HOLODECK_NAME=${REPO_NAME}-${GITHUB_REF_NAME}-${GITHUB_ACTOR}-${GITHUB_SHA:0:8}" >> $GITHUB_ENV
299319
300320
- name: Set up Holodeck
301-
uses: NVIDIA/holodeck@v0.2.1
321+
uses: NVIDIA/holodeck@ci-dynamicname
302322
env:
303323
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
304324
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
305325
AWS_SSH_KEY: ${{ secrets.AWS_SSH_KEY }}
306326
DIST: ${{ env.DIST }}
327+
INSTANCE_NAME: ${{ env.REPO_NAME }}-${{ env.BRANCH_NAME }}-${{ env.GITHUB_ACTOR }}-${{ env.COMMIT_SHORT_SHA }}
307328
with:
308329
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
309330
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

tests/holodeck_ubuntu24.04.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: holodeck.nvidia.com/v1alpha1
22
kind: Environment
33
metadata:
4-
name: HOLODECK_NAME
4+
name: HOLODECK_NAME_1
55
description: "end-to-end test infrastructure"
66
spec:
77
provider: aws

tests/scripts/findkernelversion.sh

+2
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,5 @@ if [[ $status -eq 0 ]]; then
5050
else
5151
export should_continue=true
5252
fi
53+
# SHIVA
54+
export should_continue=true

ubuntu24.04/precompiled/Dockerfile

+1-9
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,7 @@ RUN dpkg --add-architecture i386 && \
3131
pkg-config && \
3232
rm -rf /var/lib/apt/lists/*
3333

34-
RUN echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble main universe" > /etc/apt/sources.list && \
35-
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-updates main universe" >> /etc/apt/sources.list && \
36-
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-security main universe" >> /etc/apt/sources.list && \
37-
echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu noble-updates main restricted" >> /etc/apt/sources.list && \
38-
echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu noble-security main restricted" >> /etc/apt/sources.list && \
39-
usermod -o -u 0 -g 0 _apt
40-
41-
RUN curl -fsSL -o /usr/local/bin/donkey https://github.com/3XX0/donkey/releases/download/v1.1.0/donkey && \
42-
chmod +x /usr/local/bin/donkey
34+
RUN usermod -o -u 0 -g 0 _apt
4335

4436
# Install / upgrade packages here that are required to resolve CVEs
4537
ARG CVE_UPDATES

0 commit comments

Comments
 (0)