Skip to content

Commit 855409f

Browse files
authored
Merge branch 'main' into chatqna_w_endpoints
2 parents f000373 + 01f890e commit 855409f

File tree

273 files changed

+20307
-1351
lines changed

Some content is hidden

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

273 files changed

+20307
-1351
lines changed

.github/env/_build_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# Copyright (C) 2025 Intel Corporation
33
# SPDX-License-Identifier: Apache-2.0
44

5-
export VLLM_VER=v0.9.0.1
5+
export VLLM_VER=v0.10.0
66
export VLLM_FORK_VER=v0.6.6.post1+Gaudi-1.20.0

.github/workflows/_build_image.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ permissions:
66
actions: read
77
contents: read
88
checks: read
9-
deployments: read
109
discussions: read
1110
issues: read
12-
packages: read
1311
pages: read
1412
pull-requests: read
1513
repository-projects: read
16-
statuses: read
1714
security-events: read
1815
id-token: write
1916
attestations: read

.github/workflows/_example-workflow.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@ name: Example jobs
55
permissions:
66
actions: read
77
contents: read
8-
checks: read
9-
deployments: read
108
discussions: read
119
issues: read
12-
packages: read
1310
pages: read
1411
pull-requests: read
1512
repository-projects: read
16-
statuses: read
1713
security-events: read
1814
id-token: write
1915
attestations: read
@@ -73,14 +69,11 @@ jobs:
7369
actions: read
7470
contents: read
7571
checks: read
76-
deployments: read
7772
discussions: read
7873
issues: read
79-
packages: read
8074
pages: read
8175
pull-requests: read
8276
repository-projects: read
83-
statuses: read
8477
security-events: read
8578
id-token: write
8679
attestations: read
@@ -102,13 +95,9 @@ jobs:
10295
permissions:
10396
actions: read
10497
contents: read
105-
checks: write
106-
deployments: write
10798
issues: write
108-
packages: write
10999
pages: write
110100
pull-requests: write
111-
statuses: write
112101
security-events: read
113102
needs: [build-images]
114103
if: ${{ inputs.test_compose }}

.github/workflows/_get-image-list.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,74 @@ on:
1919
matrix:
2020
description: "Image List"
2121
value: ${{ jobs.get-image-list.outputs.matrix }}
22+
run_matrix:
23+
description: "Trivy Matrix composed of image name and Dockerfile path"
24+
value: ${{ jobs.get-image-list.outputs.run_matrix }}
2225

2326
jobs:
2427
get-image-list:
2528
runs-on: ubuntu-latest
2629
outputs:
2730
matrix: ${{ steps.get-matrix.outputs.matrix }}
31+
run_matrix: ${{ steps.get-matrix.outputs.run_matrix }}
2832
steps:
2933
- name: Checkout out Repo
3034
uses: actions/checkout@v4
3135

36+
- name: Checkout GenAIComps Repository
37+
uses: actions/checkout@v4
38+
with:
39+
repository: opea-project/GenAIComps
40+
path: GenAIComps
41+
3242
- name: Set Matrix
3343
id: get-matrix
3444
run: |
3545
image_list=[]
46+
run_matrix="{\"include\":["
3647
if [[ ! -z "${{ inputs.examples }}" ]]; then
3748
pip install yq
3849
examples=($(echo ${{ inputs.examples }} | tr ',' ' '))
3950
for example in ${examples[@]}
4051
do
4152
images=$(cat ${{ github.workspace }}/${example}/docker_image_build/build.yaml | yq -r '.[]' | jq 'keys' | jq -c '.')
53+
dockerfiles=$(cat ${{ github.workspace }}/${example}/docker_image_build/build.yaml | yq -r '.[]' | jq -c --arg example "$example" 'to_entries[] | { image: .key, dockerfile: ( if (.value.build.context | test("\\.\\.")) then $example + "/docker_image_build/" + .value.build.context + "/" + .value.build.dockerfile else .value.build.context + "/" + .value.build.dockerfile end ) }')
54+
dockerfiles=$(echo ${dockerfiles} | tr ' ' ',')
55+
run_matrix="${run_matrix}${dockerfiles},"
4256
image_list=$(echo ${image_list} | jq -s '.[0] + .[1] | unique' - <(echo ${images}))
4357
done
4458
fi
4559
4660
if [[ ! -z "${{ inputs.images }}" ]]; then
4761
images=($(echo ${{ inputs.images }} | tr ',' ' '))
62+
found=False
63+
for image in ${images[@]}
64+
do
65+
for compose_file in $(ls ${{ github.workspace }}/GenAIComps/.github/workflows/docker/compose/*-compose.yaml); do
66+
if grep -q "$image" "$compose_file"; then
67+
found=True
68+
docker_file="$compose_file"
69+
fi
70+
done
71+
72+
if [[ "${found}" == "False" ]]; then
73+
for build_file in $(ls ${{ github.workspace }}/*/docker_image_build/build.yaml); do
74+
if grep -q "$image" "$build_file"; then
75+
found=True
76+
docker_file="$build_file"
77+
fi
78+
done
79+
fi
80+
81+
if [[ "${found}" == "False" ]]; then
82+
echo "::error:: Image ${image} not found in any compose or build file."
83+
exit 1
84+
fi
85+
86+
dockerfiles=$(yq -r ".services[\"$image\"] | {image: \"$image\", dockerfile: ( ( .build.context // \"\" ) + ( if .build.context and .build.dockerfile then \"/\" else \"\" end ) + ( .build.dockerfile // \"\" ) )}" "$docker_file" | jq -c . | tr -d ' ')
87+
run_matrix="${run_matrix}${dockerfiles},"
88+
done
89+
4890
input_image_list=$(printf '%s\n' "${images[@]}" | sort -u | jq -R '.' | jq -sc '.')
4991
image_list=$(echo ${image_list} | jq -s '.[0] + .[1] | unique' - <(echo ${input_image_list}))
5092
fi
@@ -53,3 +95,8 @@ jobs:
5395
echo "$image_list" | jq . | jq -r '.[]'
5496
echo "end of image list..."
5597
echo "matrix=$(echo ${image_list} | jq -c '.')" >> $GITHUB_OUTPUT
98+
run_matrix="${run_matrix%,}"
99+
run_matrix="${run_matrix}]}"
100+
101+
echo "run_matrix=$(echo "${run_matrix}" | jq -c '{include: (.include | unique_by(.image))}')"
102+
echo "run_matrix=$(echo "${run_matrix}" | jq -c '{include: (.include | unique_by(.image))}')" >> $GITHUB_OUTPUT

.github/workflows/_get-test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
diff_excluded_files:
2121
required: false
2222
type: string
23-
default: '.github|README.md|*.txt'
23+
default: '.github|README.md'
2424
test_mode:
2525
required: false
2626
type: string

.github/workflows/_run-docker-compose.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@ name: Image Build
55
permissions:
66
actions: read
77
contents: read
8-
checks: write
9-
deployments: write
108
issues: write
11-
packages: write
129
pages: write
1310
pull-requests: write
14-
statuses: write
1511
security-events: read
1612
on:
1713
workflow_call:

0 commit comments

Comments
 (0)