Skip to content

Commit fd9df40

Browse files
authored
Merge branch 'main' into apptainer_python
Signed-off-by: Srikanth Ramakrishna <srikanth.ramakrishna@intel.com>
2 parents 4165ea7 + e47a2d5 commit fd9df40

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.github/workflows/lint.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,20 @@ permissions:
1818
actions: read
1919
statuses: write
2020
on:
21-
merge_group: null
2221
pull_request: null
22+
push:
23+
branches: ["main"]
2324
concurrency:
2425
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2526
cancel-in-progress: true
2627
jobs:
2728
lint:
2829
name: Lint
2930
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
31+
permissions:
32+
contents: read
33+
actions: read
34+
statuses: write
3035
steps:
3136
- name: Harden Runner
3237
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1

.github/workflows/weekly-test.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ permissions: read-all
2121
jobs:
2222
get-groups:
2323
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
24+
runs-on: intel-ubuntu-latest
2425
outputs:
2526
groups: ${{ steps.group-list.outputs.FOLDERS }}
2627
steps:

test-runner/utils/test.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Test(BaseModel):
5757
notebook: Optional[bool] = False
5858
serving: Optional[bool] = False
5959
cap_add: Optional[str] = "AUDIT_READ"
60-
device: Optional[str] = "/dev/dri"
60+
device: Optional[str] = []
6161
entrypoint: Optional[str] = ""
6262
groups_add: Optional[List[str]] = ["109", "44"]
6363
hostname: Optional[str] = None
@@ -109,7 +109,7 @@ def serving_run(self, img: str, env: dict, volumes: Volume):
109109
networks=["host"],
110110
# Misc
111111
cap_add=[self.cap_add],
112-
devices=[expandvars(self.device, nounset=True)],
112+
devices=self.device,
113113
entrypoint=(
114114
expandvars(self.entrypoint, nounset=True) if self.entrypoint else None
115115
),
@@ -134,7 +134,7 @@ def serving_run(self, img: str, env: dict, volumes: Volume):
134134
networks=["host"],
135135
# Misc
136136
cap_add=[self.cap_add],
137-
devices=[expandvars(self.device, nounset=True)],
137+
devices=self.device,
138138
hostname=self.hostname,
139139
ipc=self.ipc,
140140
privileged=self.privileged,
@@ -231,7 +231,7 @@ def container_run(self):
231231
volumes=volumes,
232232
# Misc
233233
cap_add=[self.cap_add],
234-
devices=[expandvars(self.device, nounset=True)],
234+
devices=self.device,
235235
entrypoint=(
236236
expandvars(self.entrypoint, nounset=True)
237237
if self.entrypoint

0 commit comments

Comments
 (0)