Skip to content

Commit e47a2d5

Browse files
author
tylertitsworth
committed
update labels
Signed-off-by: tylertitsworth <tyler.titsworth@intel.com>
1 parent 6af3cdf commit e47a2d5

10 files changed

+39
-34
lines changed

.github/linters/actionlint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
---
1615
self-hosted-runner:
1716
labels:
18-
- k8-runners
19-
- kubectl
17+
- intel-ubuntu-latest
18+
- k8-runners
19+
- kubectl

.github/workflows/container-ci.yaml

+14-14
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ on:
5757
required: false
5858
type: boolean
5959
jobs:
60-
####################################################################################################
61-
# Compose Build
62-
####################################################################################################
60+
####################################################################################################
61+
# Compose Build
62+
####################################################################################################
6363
setup-build:
6464
outputs:
6565
matrix: ${{ steps.build-matrix.outputs.matrix }}
66-
runs-on: ubuntu-latest
66+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
6767
steps:
6868
- name: Harden Runner
6969
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
@@ -79,7 +79,7 @@ jobs:
7979
build-containers:
8080
needs: [setup-build]
8181
env: ${{ matrix }}
82-
runs-on: ubuntu-latest
82+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
8383
strategy:
8484
matrix: ${{ fromJson(needs.setup-build.outputs.matrix) }}
8585
fail-fast: false
@@ -105,13 +105,13 @@ jobs:
105105
repo: ${{ secrets.REPO }}
106106
no-push: ${{ inputs.no_push }}
107107
no-start: ${{ inputs.no_start }}
108-
####################################################################################################
109-
# Trivy Scan
110-
####################################################################################################
108+
####################################################################################################
109+
# Trivy Scan
110+
####################################################################################################
111111
setup-scan:
112112
needs: [build-containers]
113113
if: ${{ github.event_name == 'pull_request' }}
114-
runs-on: ubuntu-latest
114+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
115115
outputs:
116116
matrix: ${{ steps.scan-matrix.outputs.matrix }}
117117
steps:
@@ -128,7 +128,7 @@ jobs:
128128
scan-containers:
129129
needs: [setup-scan]
130130
if: ${{ !inputs.no_build && github.event_name == 'pull_request' }}
131-
runs-on: ubuntu-latest
131+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
132132
strategy:
133133
matrix:
134134
container: ${{ fromJSON(needs.setup-scan.outputs.matrix) }}
@@ -159,12 +159,12 @@ jobs:
159159
sarif_file: '${{ matrix.container }}-scan.sarif'
160160
category: '${{ matrix.container }}'
161161
continue-on-error: true
162-
####################################################################################################
163-
# Generic Test Runner
164-
####################################################################################################
162+
####################################################################################################
163+
# Generic Test Runner
164+
####################################################################################################
165165
setup-test:
166166
needs: [build-containers]
167-
runs-on: ubuntu-latest
167+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
168168
outputs:
169169
matrix: ${{ steps.test-matrix.outputs.matrix }}
170170
steps:

.github/workflows/dependency-review.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ concurrency:
2929
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
3030
jobs:
3131
dependency-review:
32-
runs-on: ubuntu-latest
32+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
3333
permissions:
3434
pull-requests: write
3535
steps:

.github/workflows/dockerhub-description.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
permissions: read-all
2020
jobs:
2121
setup-matrix:
22-
runs-on: ubuntu-latest
22+
runs-on: intel-ubuntu-latest
2323
outputs:
2424
matrix: ${{ steps.set-matrix.outputs.matrix }}
2525
steps:
@@ -32,7 +32,7 @@ jobs:
3232
id: set-matrix
3333
run: echo "matrix=$(jq -c . < .github/dockerhub-readmes.json)" >> $GITHUB_OUTPUT
3434
publish-dockerhub-description:
35-
runs-on: ubuntu-latest
35+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
3636
needs: setup-matrix
3737
strategy:
3838
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}

.github/workflows/docs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525
cancel-in-progress: true
2626
jobs:
2727
mkdocs:
28-
runs-on: ubuntu-latest
28+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
2929
permissions:
3030
contents: read
3131
id-token: write

.github/workflows/integration-test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ concurrency:
2121
cancel-in-progress: true
2222
jobs:
2323
group-diff:
24-
runs-on: ubuntu-latest
24+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
2525
outputs:
2626
groups: ${{ steps.group-list.outputs.FOLDERS }}
2727
steps:
@@ -71,7 +71,7 @@ jobs:
7171
secrets: inherit
7272
status-check:
7373
needs: [group-diff, pipeline-ci]
74-
runs-on: ubuntu-latest
74+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
7575
if: always()
7676
steps:
7777
- name: Harden Runner

.github/workflows/lint.yaml

+7-2
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,20 @@
1515
name: Lint
1616
permissions: read-all
1717
on:
18-
merge_group: null
1918
pull_request: null
19+
push:
20+
branches: ["main"]
2021
concurrency:
2122
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2223
cancel-in-progress: true
2324
jobs:
2425
lint:
2526
name: Lint
26-
runs-on: ubuntu-latest
27+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
28+
permissions:
29+
contents: read
30+
actions: read
31+
statuses: write
2732
steps:
2833
- name: Harden Runner
2934
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1

.github/workflows/test-runner-ci.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ concurrency:
2626
cancel-in-progress: true
2727
jobs:
2828
unit-test:
29-
runs-on: ubuntu-latest
29+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
3030
strategy:
3131
matrix:
3232
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
@@ -63,7 +63,7 @@ jobs:
6363
REPO: ${{ secrets.REPO }}
6464
coverage:
6565
needs: [unit-test]
66-
runs-on: ubuntu-latest
66+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
6767
steps:
6868
- name: Harden Runner
6969
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
@@ -73,7 +73,7 @@ jobs:
7373
with:
7474
parallel-finished: true
7575
integration-test:
76-
runs-on: ubuntu-latest
76+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
7777
steps:
7878
- name: Harden Runner
7979
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1

.github/workflows/weekly-test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
permissions: read-all
2121
jobs:
2222
get-groups:
23-
runs-on: ubuntu-latest
23+
runs-on: intel-ubuntu-latest
2424
outputs:
2525
groups: ${{ steps.group-list.outputs.FOLDERS }}
2626
steps:
@@ -69,7 +69,7 @@ jobs:
6969
kubeconfig_path: ${{ secrets.KUBECONFIG_PATH }}
7070
scan:
7171
name: gitleaks
72-
runs-on: ubuntu-latest
72+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
7373
steps:
7474
- name: Harden Runner
7575
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1

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)