Skip to content

Commit ffce706

Browse files
authored
Fix image on push action due to manifest test remove (#1460)
1. Fix image on push action due to manifest test remove. 2. Fix helm test cd workflow get test matrix step. Signed-off-by: chensuyue <suyue.chen@intel.com>
1 parent 9b0f98b commit ffce706

8 files changed

+10
-237
lines changed

.github/workflows/_helm-e2e.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
sort -u)
7272
echo $values_files
7373
elif [ "${{ inputs.mode }}" = "CD" ]; then
74-
values_files=$(ls ${{ inputs.example }}/kubernetes/helm/*values.yaml)
74+
values_files=$(ls ${{ inputs.example }}/kubernetes/helm/*values.yaml || true)
7575
fi
7676
value_files="["
7777
for file in ${values_files}; do
@@ -100,6 +100,7 @@ jobs:
100100
strategy:
101101
matrix:
102102
value_file: ${{ fromJSON(needs.get-test-case.outputs.value_files) }}
103+
fail-fast: false
103104
runs-on: k8s-${{ inputs.hardware }}
104105
continue-on-error: true
105106
steps:

.github/workflows/_manifest-e2e.yml

Lines changed: 0 additions & 185 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
echo "test_cases=$test_cases"
9090
echo "test_cases=$test_cases" >> $GITHUB_OUTPUT
9191
92-
run-test:
92+
compose-test:
9393
needs: [get-test-case]
9494
strategy:
9595
matrix:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ on:
3636
required: false
3737
type: boolean
3838
test_helmchart:
39-
default: false
39+
default: true
4040
description: 'Test examples with helm charts'
4141
required: false
4242
type: boolean

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
if: ${{ !github.event.pull_request.draft }}
2929
uses: ./.github/workflows/_get-test-matrix.yml
3030
with:
31-
diff_excluded_files: '\.github|\.md|\.txt|kubernetes|manifest|gmc|assets|benchmark'
31+
diff_excluded_files: '\.github|\.md|\.txt|kubernetes|gmc|assets|benchmark'
3232

3333
example-test:
3434
needs: [get-test-matrix]
@@ -42,5 +42,5 @@ jobs:
4242
tag: "ci"
4343
example: ${{ matrix.example }}
4444
hardware: ${{ matrix.hardware }}
45-
diff_excluded_files: '\.github|\.md|\.txt|kubernetes|manifest|gmc|assets|benchmark'
45+
diff_excluded_files: '\.github|\.md|\.txt|kubernetes|gmc|assets|benchmark'
4646
secrets: inherit

.github/workflows/pr-gmc-e2e.yaml.disabled

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ on:
88
branches: ["main", "*rc"]
99
types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped
1010
paths:
11-
- "**/kubernetes/**/gmc/**"
11+
- "**/kubernetes/gmc/**"
1212
- "**/tests/test_gmc**"
1313
- "!**.md"
1414
- "!**.txt"
15-
- "!**/kubernetes/**/manifest/**"
1615

1716
concurrency:
1817
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -22,7 +21,7 @@ jobs:
2221
job1:
2322
uses: ./.github/workflows/_get-test-matrix.yml
2423
with:
25-
diff_excluded_files: '\.github|docker_compose|manifest|assets|\.md|\.txt'
24+
diff_excluded_files: '\.github|docker_compose|assets|\.md|\.txt'
2625
test_mode: "gmc"
2726

2827
gmc-test:

.github/workflows/pr-manifest-e2e.yml.disabled

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/workflows/scripts/get_test_matrix.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ for example in ${examples}; do
1717
cd tests
1818
ls -l
1919
if [[ "$test_mode" == "docker_image_build" ]]; then
20-
find_name="test_manifest_on_*.sh"
20+
hardware_list="gaudi xeon"
2121
else
2222
find_name="test_${test_mode}*_on_*.sh"
23+
hardware_list=$(find . -type f -name "${find_name}" | cut -d/ -f2 | cut -d. -f1 | awk -F'_on_' '{print $2}'| sort -u)
2324
fi
24-
hardware_list=$(find . -type f -name "${find_name}" | cut -d/ -f2 | cut -d. -f1 | awk -F'_on_' '{print $2}'| sort -u)
2525
echo -e "Test supported hardware list: \n${hardware_list}"
2626

2727
run_hardware=""

0 commit comments

Comments
 (0)