Skip to content

Commit 3c5fc80

Browse files
authored
update cd workflow (#689)
Signed-off-by: ZePan110 <[email protected]> Signed-off-by: chensuyue <[email protected]>
1 parent 2794abd commit 3c5fc80

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

.github/workflows/_comps-workflow.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ permissions: read-all
66
on:
77
workflow_call:
88
inputs:
9-
node:
10-
required: true
11-
type: string
129
service:
1310
required: true
1411
type: string
@@ -36,7 +33,7 @@ jobs:
3633
# Image Build
3734
####################################################################################################
3835
build-images:
39-
runs-on: "docker-build-${{ inputs.node }}"
36+
runs-on: "docker-build-gaudi"
4037
continue-on-error: true
4138
outputs:
4239
file_exists: ${{ steps.get-yaml-path.outputs.file_exists }}
@@ -84,10 +81,9 @@ jobs:
8481
####################################################################################################
8582
test-service-compose:
8683
needs: [build-images]
87-
if: ${{ fromJSON(inputs.test) && needs.build-images.outputs.file_exists == 'true' }}
84+
if: ${{ fromJSON(inputs.test) }}
8885
uses: ./.github/workflows/_run-docker-compose.yml
8986
with:
9087
tag: ${{ inputs.tag }}
9188
service: ${{ inputs.service }}
92-
hardware: ${{ inputs.node }}
9389
secrets: inherit

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ on:
2020
description: Example to test
2121
required: true
2222
type: string
23-
hardware:
24-
description: Hardware to run the test on
25-
required: true
26-
type: string
2723
jobs:
2824
get-test-case:
2925
runs-on: ubuntu-latest
@@ -57,14 +53,15 @@ jobs:
5753
cd ${{ github.workspace }}/tests
5854
test_cases=$(find . -type f -name "test_${service_l}*.sh" -print | jq -R '.' | jq -sc '.')
5955
echo "test_cases=$test_cases" >> $GITHUB_OUTPUT
56+
# TODO: get hardware for test matrix
6057
6158
run-test:
6259
needs: [get-test-case]
6360
strategy:
6461
matrix:
6562
test_case: ${{ fromJSON(needs.get-test-case.outputs.test_cases) }}
6663
fail-fast: false
67-
runs-on: ${{ inputs.hardware }}
64+
runs-on: gaudi
6865
continue-on-error: true
6966
steps:
7067
- name: Clean up Working Directory
@@ -88,7 +85,6 @@ jobs:
8885
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
8986
PINECONE_KEY: ${{ secrets.PINECONE_KEY }}
9087
service: ${{ inputs.service }}
91-
hardware: ${{ inputs.hardware }}
9288
test_case: ${{ matrix.test_case }}
9389
run: |
9490
cd ${{ github.workspace }}/tests

.github/workflows/manual-comps-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ jobs:
5656
with:
5757
service: ${{ matrix.service }}
5858
tag: ${{ inputs.tag }}
59-
node: gaudi
6059
mode: ${{ inputs.mode }}
6160
test: ${{ inputs.test }}
6261
secrets: inherit

0 commit comments

Comments
 (0)