From 6b1ef365a5fde5d76ec27d320c34b03e399161c6 Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Thu, 13 Feb 2025 16:56:05 +0800 Subject: [PATCH 1/9] Fix docker images BoM/CVE scan Signed-off-by: ZePan110 --- .github/workflows/manual-docker-scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-docker-scan.yml b/.github/workflows/manual-docker-scan.yml index 46213adf21..55a2f3d33a 100644 --- a/.github/workflows/manual-docker-scan.yml +++ b/.github/workflows/manual-docker-scan.yml @@ -47,7 +47,7 @@ jobs: scan-docker: needs: get-image-list runs-on: "docker-build-${{ inputs.node }}" - if: ${{ fromJSON(needs.get-image-list.outputs.matrix).length != 0 }} + if: ${{ needs.get-image-list.outputs.matrix != '' }} strategy: matrix: image: ${{ fromJson(needs.get-image-list.outputs.matrix) }} From 10ec95fee20647460bbdf726e27a733836144f11 Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Thu, 13 Feb 2025 17:39:19 +0800 Subject: [PATCH 2/9] Fix Clean up Local Registry on manual event workflow Fix helm test For Call workflow Signed-off-by: ZePan110 --- .github/workflows/_helm-e2e.yml | 2 +- .github/workflows/manual-reset-local-registry.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_helm-e2e.yml b/.github/workflows/_helm-e2e.yml index a1a3953c1e..8390e8e0c3 100644 --- a/.github/workflows/_helm-e2e.yml +++ b/.github/workflows/_helm-e2e.yml @@ -97,7 +97,7 @@ jobs: helm-test: needs: [get-test-case] - if: ${{ fromJSON(needs.get-test-case.outputs.value_files).length != 0 }} + if: ${{ needs.get-test-case.outputs.value_files != '[]' }} strategy: matrix: value_file: ${{ fromJSON(needs.get-test-case.outputs.value_files) }} diff --git a/.github/workflows/manual-reset-local-registry.yml b/.github/workflows/manual-reset-local-registry.yml index 504df08d06..de9cfd78e9 100644 --- a/.github/workflows/manual-reset-local-registry.yml +++ b/.github/workflows/manual-reset-local-registry.yml @@ -33,7 +33,7 @@ jobs: clean-up: needs: get-build-matrix - if: ${{ fromJSON(needs.get-build-matrix.outputs.nodes).length != 0 }} + if: ${{ needs.get-image-list.outputs.matrix != '' }} strategy: matrix: node: ${{ fromJson(needs.get-build-matrix.outputs.nodes) }} @@ -48,7 +48,7 @@ jobs: build: needs: [get-build-matrix, clean-up] - if: ${{ fromJSON(needs.get-build-matrix.outputs.nodes).length != 0 }} + if: ${{ needs.get-image-list.outputs.matrix != '' }} strategy: matrix: example: ${{ fromJson(needs.get-build-matrix.outputs.examples) }} From 95e9a94f56974d197ed64345e4d571b130c7eaaf Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Thu, 13 Feb 2025 18:24:31 +0800 Subject: [PATCH 3/9] Fix Build latest images on push event workflow Signed-off-by: ZePan110 --- .github/workflows/push-image-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-image-build.yml b/.github/workflows/push-image-build.yml index f704f4d047..4358a94c48 100644 --- a/.github/workflows/push-image-build.yml +++ b/.github/workflows/push-image-build.yml @@ -24,7 +24,7 @@ jobs: image-build: needs: job1 - if: ${{ fromJSON(needs.job1.outputs.run_matrix).length != 0 }} + if: ${{ needs.job1.outputs.run_matrix != "" }} strategy: matrix: ${{ fromJSON(needs.job1.outputs.run_matrix) }} fail-fast: false From 7c452a5f5eac19ac98e56d78576edd30d71593e9 Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Thu, 13 Feb 2025 18:29:47 +0800 Subject: [PATCH 4/9] test Signed-off-by: ZePan110 --- .github/workflows/push-image-build.yml | 5 ++++- AgentQnA/docker_compose/intel/hpu/gaudi/compose.yaml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push-image-build.yml b/.github/workflows/push-image-build.yml index 4358a94c48..e731052804 100644 --- a/.github/workflows/push-image-build.yml +++ b/.github/workflows/push-image-build.yml @@ -5,12 +5,15 @@ name: Build latest images on push event on: push: - branches: [ 'main' ] + branches: [ 'main','Fix-CICD' ] paths: - "**.py" - "**Dockerfile*" - "**docker_image_build/build.yaml" - "**/ui/**" + pull_request: + branches: [main] + types: [opened, reopened, ready_for_review, synchronize] concurrency: group: ${{ github.workflow }}-${{ github.ref }}-on-push diff --git a/AgentQnA/docker_compose/intel/hpu/gaudi/compose.yaml b/AgentQnA/docker_compose/intel/hpu/gaudi/compose.yaml index 4895722c93..361942e6e2 100644 --- a/AgentQnA/docker_compose/intel/hpu/gaudi/compose.yaml +++ b/AgentQnA/docker_compose/intel/hpu/gaudi/compose.yaml @@ -94,3 +94,4 @@ services: WORKER_AGENT_URL: $WORKER_AGENT_URL SQL_AGENT_URL: $SQL_AGENT_URL port: 9090 + #test From 443cf542daf88f89e2ed3c34835ce3d04bba292f Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Thu, 13 Feb 2025 18:42:08 +0800 Subject: [PATCH 5/9] Fix typo Signed-off-by: ZePan110 --- .github/workflows/push-image-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-image-build.yml b/.github/workflows/push-image-build.yml index e731052804..594a97faf3 100644 --- a/.github/workflows/push-image-build.yml +++ b/.github/workflows/push-image-build.yml @@ -27,7 +27,7 @@ jobs: image-build: needs: job1 - if: ${{ needs.job1.outputs.run_matrix != "" }} + if: ${{ needs.job1.outputs.run_matrix != '' }} strategy: matrix: ${{ fromJSON(needs.job1.outputs.run_matrix) }} fail-fast: false From bab13effc472d51a858a7e452b2a63f11ac34f25 Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Thu, 13 Feb 2025 19:02:35 +0800 Subject: [PATCH 6/9] Remove test code Signed-off-by: ZePan110 --- .github/workflows/push-image-build.yml | 5 +---- AgentQnA/docker_compose/intel/hpu/gaudi/compose.yaml | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/push-image-build.yml b/.github/workflows/push-image-build.yml index 594a97faf3..b40b265c76 100644 --- a/.github/workflows/push-image-build.yml +++ b/.github/workflows/push-image-build.yml @@ -5,15 +5,12 @@ name: Build latest images on push event on: push: - branches: [ 'main','Fix-CICD' ] + branches: [ 'main' ] paths: - "**.py" - "**Dockerfile*" - "**docker_image_build/build.yaml" - "**/ui/**" - pull_request: - branches: [main] - types: [opened, reopened, ready_for_review, synchronize] concurrency: group: ${{ github.workflow }}-${{ github.ref }}-on-push diff --git a/AgentQnA/docker_compose/intel/hpu/gaudi/compose.yaml b/AgentQnA/docker_compose/intel/hpu/gaudi/compose.yaml index 361942e6e2..4895722c93 100644 --- a/AgentQnA/docker_compose/intel/hpu/gaudi/compose.yaml +++ b/AgentQnA/docker_compose/intel/hpu/gaudi/compose.yaml @@ -94,4 +94,3 @@ services: WORKER_AGENT_URL: $WORKER_AGENT_URL SQL_AGENT_URL: $SQL_AGENT_URL port: 9090 - #test From d1a76a20dc9d22895b5115d179074699c62b8064 Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Thu, 13 Feb 2025 23:02:24 +0800 Subject: [PATCH 7/9] Optimize push-image-build.yml Signed-off-by: ZePan110 --- .github/workflows/push-image-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-image-build.yml b/.github/workflows/push-image-build.yml index b40b265c76..0cbbb970db 100644 --- a/.github/workflows/push-image-build.yml +++ b/.github/workflows/push-image-build.yml @@ -24,7 +24,7 @@ jobs: image-build: needs: job1 - if: ${{ needs.job1.outputs.run_matrix != '' }} + if: ${{ needs.job1.outputs.run_matrix != '{"include":[]}' }} strategy: matrix: ${{ fromJSON(needs.job1.outputs.run_matrix) }} fail-fast: false From 872446e38ca9f3975a04db192c83280efd532eae Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Thu, 13 Feb 2025 23:04:09 +0800 Subject: [PATCH 8/9] test Signed-off-by: ZePan110 --- .github/workflows/push-image-build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/push-image-build.yml b/.github/workflows/push-image-build.yml index 0cbbb970db..a1960ca2b4 100644 --- a/.github/workflows/push-image-build.yml +++ b/.github/workflows/push-image-build.yml @@ -11,6 +11,9 @@ on: - "**Dockerfile*" - "**docker_image_build/build.yaml" - "**/ui/**" + pull_request: + branches: [main] + types: [opened, reopened, ready_for_review, synchronize] concurrency: group: ${{ github.workflow }}-${{ github.ref }}-on-push From 47a47e13d520813799143b0a270c2e29077e2778 Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Thu, 13 Feb 2025 23:09:45 +0800 Subject: [PATCH 9/9] Revert "test" This reverts commit 872446e38ca9f3975a04db192c83280efd532eae. --- .github/workflows/push-image-build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/push-image-build.yml b/.github/workflows/push-image-build.yml index a1960ca2b4..0cbbb970db 100644 --- a/.github/workflows/push-image-build.yml +++ b/.github/workflows/push-image-build.yml @@ -11,9 +11,6 @@ on: - "**Dockerfile*" - "**docker_image_build/build.yaml" - "**/ui/**" - pull_request: - branches: [main] - types: [opened, reopened, ready_for_review, synchronize] concurrency: group: ${{ github.workflow }}-${{ github.ref }}-on-push