Skip to content

Commit 1fc84da

Browse files
authored
Merge branch 'main' into agents/finance_compose
2 parents e5a59e5 + 144b56a commit 1fc84da

10 files changed

+136
-20
lines changed

.github/workflows/_example-workflow.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,22 @@ jobs:
6969
# Image Build
7070
####################################################################################################
7171
build-images:
72+
permissions:
73+
actions: read
74+
contents: read
75+
checks: read
76+
deployments: read
77+
discussions: read
78+
issues: read
79+
packages: read
80+
pages: read
81+
pull-requests: read
82+
repository-projects: read
83+
statuses: read
84+
security-events: read
85+
id-token: write
86+
attestations: read
87+
models: read
7288
uses: ./.github/workflows/_build_image.yml
7389
with:
7490
node: ${{ inputs.node }}
@@ -83,6 +99,17 @@ jobs:
8399
# Docker Compose Test
84100
####################################################################################################
85101
test-example-compose:
102+
permissions:
103+
actions: read
104+
contents: read
105+
checks: write
106+
deployments: write
107+
issues: write
108+
packages: write
109+
pages: write
110+
pull-requests: write
111+
statuses: write
112+
security-events: read
86113
needs: [build-images]
87114
if: ${{ inputs.test_compose }}
88115
uses: ./.github/workflows/_run-docker-compose.yml
@@ -99,6 +126,8 @@ jobs:
99126
# helmchart Test
100127
####################################################################################################
101128
test-helmchart:
129+
permissions:
130+
contents: read
102131
if: ${{ fromJSON(inputs.test_helmchart) }}
103132
uses: ./.github/workflows/_helm-e2e.yml
104133
with:

.github/workflows/manual-example-workflow.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,22 @@ jobs:
9999
opea_branch: ${{ inputs.opea_branch }}
100100

101101
run-examples:
102+
permissions:
103+
actions: read
104+
attestations: read
105+
discussions: read
106+
models: read
107+
repository-projects: read
108+
id-token: write
109+
contents: read
110+
checks: write
111+
deployments: write
112+
issues: write
113+
packages: write
114+
pages: write
115+
pull-requests: write
116+
statuses: write
117+
security-events: read
102118
needs: [get-test-matrix, build-comps-base]
103119
strategy:
104120
matrix:

.github/workflows/manual-image-build.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,22 @@ jobs:
6666
echo "nodes=$nodes_json" >> $GITHUB_OUTPUT
6767
6868
image-build:
69+
permissions:
70+
actions: read
71+
attestations: read
72+
discussions: read
73+
models: read
74+
repository-projects: read
75+
id-token: write
76+
contents: read
77+
checks: write
78+
deployments: write
79+
issues: write
80+
packages: write
81+
pages: write
82+
pull-requests: write
83+
statuses: write
84+
security-events: read
6985
needs: get-test-matrix
7086
if: ${{ needs.get-test-matrix.outputs.nodes != '' }}
7187
strategy:

.github/workflows/manual-reset-local-registry.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,22 @@ jobs:
6363
docker ps | grep registry
6464
6565
build:
66+
permissions:
67+
actions: read
68+
attestations: read
69+
discussions: read
70+
models: read
71+
repository-projects: read
72+
id-token: write
73+
contents: read
74+
checks: write
75+
deployments: write
76+
issues: write
77+
packages: write
78+
pages: write
79+
pull-requests: write
80+
statuses: write
81+
security-events: read
6682
needs: [get-build-matrix, clean-up]
6783
if: ${{ needs.get-image-list.outputs.matrix != '' }}
6884
strategy:

.github/workflows/nightly-docker-build-publish.yml

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,21 @@
33

44
name: Nightly build/publish latest docker images
55
permissions:
6+
actions: read
7+
contents: read
8+
checks: read
9+
deployments: read
10+
discussions: read
11+
issues: read
12+
packages: read
13+
pages: read
14+
pull-requests: read
15+
repository-projects: read
16+
statuses: read
617
security-events: read
18+
id-token: write
19+
attestations: read
20+
models: read
721

822
on:
923
schedule:
@@ -77,20 +91,20 @@ jobs:
7791
needs: [get-build-matrix]
7892
permissions:
7993
actions: read
80-
contents: read
81-
checks: read
82-
deployments: read
94+
attestations: read
8395
discussions: read
84-
issues: read
85-
packages: read
86-
pages: read
87-
pull-requests: read
96+
models: read
8897
repository-projects: read
89-
statuses: read
90-
security-events: read
9198
id-token: write
92-
attestations: read
93-
models: read
99+
contents: read
100+
checks: write
101+
deployments: write
102+
issues: write
103+
packages: write
104+
pages: write
105+
pull-requests: write
106+
statuses: write
107+
security-events: read
94108
if: ${{ needs.get-build-matrix.outputs.examples_json != '' }}
95109
strategy:
96110
matrix:

.github/workflows/pr-docker-compose-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
- "**.py"
1616
- "**/docker_compose/**"
1717
- "**/docker_image_build/**"
18-
- "**/tests/test_compose**"
18+
- "**/tests/**"
1919
- "**/ui/**"
2020
- "!**.md"
2121
- "!**.txt"

.github/workflows/push-image-build.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,22 @@ jobs:
4040
test_mode: "docker_image_build"
4141

4242
image-build:
43+
permissions:
44+
actions: read
45+
attestations: read
46+
discussions: read
47+
models: read
48+
repository-projects: read
49+
id-token: write
50+
contents: read
51+
checks: write
52+
deployments: write
53+
issues: write
54+
packages: write
55+
pages: write
56+
pull-requests: write
57+
statuses: write
58+
security-events: read
4359
needs: job1
4460
if: ${{ needs.job1.outputs.run_matrix != '{"include":[]}' }}
4561
strategy:

.github/workflows/scripts/get_test_matrix.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ for example in ${examples}; do
4040
done
4141
fi
4242
for hw in ${run_hardware}; do
43+
# TODO: remove this condition when ROCm hardware is available
44+
if [[ "${hw}" == "rocm" ]]; then
45+
echo "Skip test on ROCm hardware for 2 weeks due to lack of test machine..."
46+
continue
47+
fi
4348
run_matrix="${run_matrix}{\"example\":\"${example}\",\"hardware\":\"${hw}\"},"
4449
done
4550
done

.github/workflows/weekly-example-test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
env:
1616
EXAMPLES: ${{ vars.NIGHTLY_RELEASE_EXAMPLES }}
17-
NODES: "gaudi,xeon,rocm,arc"
17+
NODES: "gaudi,xeon,arc"
1818

1919
jobs:
2020
get-test-matrix:
@@ -52,16 +52,16 @@ jobs:
5252
id-token: write
5353
actions: read
5454
attestations: read
55-
checks: read
56-
deployments: read
55+
checks: write
56+
deployments: write
5757
discussions: read
58-
issues: read
58+
issues: write
5959
models: read
60-
packages: read
61-
pages: read
62-
pull-requests: read
60+
packages: write
61+
pages: write
62+
pull-requests: write
6363
repository-projects: read
64-
statuses: read
64+
statuses: write
6565
security-events: read
6666
needs: [get-test-matrix, build-comps-base]
6767
strategy:

AgentQnA/tests/step1_build_images.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ function get_genai_comps() {
1313
if [ ! -d "GenAIComps" ] ; then
1414
git clone --depth 1 --branch ${opea_branch:-"main"} https://github.com/opea-project/GenAIComps.git
1515
fi
16+
pushd GenAIComps
17+
echo "GenAIComps test commit is $(git rev-parse HEAD)"
18+
docker build --no-cache -t ${REGISTRY}/comps-base:${TAG} --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
19+
popd && sleep 1s
1620
}
1721

1822
function build_docker_images_for_retrieval_tool(){

0 commit comments

Comments
 (0)