Skip to content

Commit 2746bf4

Browse files
author
wwanarif
committed
update workflow
Signed-off-by: wwanarif <[email protected]>
1 parent a09fb02 commit 2746bf4

File tree

7 files changed

+34
-38
lines changed

7 files changed

+34
-38
lines changed

‎.github/workflows/_build-image-to-registry.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (C) 2024 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33

4-
name: Uses - Build Images to Registry
4+
name: Call - Build Images to Registry
55
permissions: read-all
66
on:
77
workflow_call:
@@ -14,13 +14,9 @@ on:
1414
default: "latest"
1515
required: false
1616
type: string
17-
test_e2e:
18-
default: true
19-
required: false
20-
type: boolean
2117

2218
jobs:
23-
build-images:
19+
call-build-image-to-registry:
2420
runs-on: "docker-build-${{ inputs.node }}"
2521
steps:
2622
- name: Clean Up Working Directory

‎.github/workflows/_e2e-test.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (C) 2024 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33

4-
name: Uses - E2E Test
4+
name: Call - E2E Test
55
permissions: read-all
66
on:
77
workflow_call:
@@ -16,7 +16,7 @@ on:
1616
type: string
1717

1818
jobs:
19-
run-e2e-test:
19+
call-e2e-test:
2020
runs-on: "docker-build-${{ inputs.node }}"
2121
steps:
2222
- name: Clean Up Working Directory
@@ -80,9 +80,3 @@ jobs:
8080
name: playwright-test-results
8181
path: ${{ github.workspace }}/tests/playwright/test-results
8282

83-
# - name: Clean Up GenAIStudio Deployment
84-
# run: |
85-
# kubectl delete -f manifests/studio-manifest.yaml || true
86-
# kubectl delete -f manifests/monitoring-manifest.yaml || true
87-
# working-directory: ${{ github.workspace }}/setup-scripts/setup-genai-studio/
88-

‎.github/workflows/manual-docker-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (C) 2024 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33

4-
name: Manual Build Images
4+
name: Manual - Docker Build
55
on:
66
workflow_dispatch:
77
inputs:
@@ -21,7 +21,7 @@ concurrency:
2121
cancel-in-progress: true
2222

2323
jobs:
24-
image-build:
24+
manual-docker-build:
2525
uses: ./.github/workflows/_build-image-to-registry.yml
2626
with:
2727
node: ${{ inputs.nodes }}

‎.github/workflows/manual-docker-scan.yml‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (C) 2024 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33

4-
name: Manual Image BoM and CVE Scan
4+
name: Manual - Docker Scan (SBOM and CVE)
55
on:
66
workflow_dispatch:
77
inputs:
@@ -36,13 +36,12 @@ jobs:
3636
sudo rm -rf ${{github.workspace}}/* || true
3737
# docker system prune -f
3838
39-
scan-docker:
39+
manual-docker-scan:
4040
needs: clean-workspace
4141
runs-on: "docker-build-${{ inputs.node }}"
4242
strategy:
4343
matrix:
44-
# image: ["studio-frontend", "studio-backend", "app-frontend", "app-backend"]
45-
image: ["app-backend"]
44+
image: ["studio-frontend", "studio-backend", "app-frontend", "app-backend"]
4645
fail-fast: false
4746
steps:
4847
- name: Pull Image
@@ -58,17 +57,17 @@ jobs:
5857
output-file: ${{ matrix.image }}-sbom-scan.txt
5958
format: 'spdx-json'
6059

61-
# - name: Security Scan Container
62-
# uses: aquasecurity/[email protected]
63-
# if: ${{ inputs.trivy_scan }}
64-
# with:
65-
# image-ref: ${{ env.OPEA_IMAGE_REPO }}opea/${{ matrix.image }}:${{ inputs.tag }}
66-
# output: ${{ matrix.image }}-trivy-scan.txt
67-
# format: 'table'
68-
# exit-code: '1'
69-
# ignore-unfixed: true
70-
# vuln-type: 'os,library'
71-
# severity: 'CRITICAL,HIGH'
60+
- name: Security Scan Container
61+
uses: aquasecurity/[email protected]
62+
if: ${{ inputs.trivy_scan }}
63+
with:
64+
image-ref: ${{ env.OPEA_IMAGE_REPO }}opea/${{ matrix.image }}:${{ inputs.tag }}
65+
output: ${{ matrix.image }}-trivy-scan.txt
66+
format: 'table'
67+
exit-code: '1'
68+
ignore-unfixed: true
69+
vuln-type: 'os,library'
70+
severity: 'CRITICAL,HIGH'
7271

7372
- name: Cleanup
7473
if: always()
@@ -81,7 +80,7 @@ jobs:
8180
mv ${{ matrix.image }}-*-scan.txt /tmp/scan-${{ inputs.tag }}-${{ github.run_number }}
8281
8382
upload-artifacts:
84-
needs: scan-docker
83+
needs: manual-docker-scan
8584
runs-on: "docker-build-${{ inputs.node }}"
8685
if: always()
8786
steps:

‎.github/workflows/pr-code-scan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (C) 2024 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33

4-
name: PR Code Scan
4+
name: PR - Code Scan (Bandit and Hadolint)
55

66
on:
77
pull_request:
@@ -24,7 +24,7 @@ env:
2424
CONTAINER_NAME: "code-scan"
2525

2626
jobs:
27-
code-scan:
27+
pr-code-scan:
2828
runs-on: ubuntu-latest
2929
strategy:
3030
matrix:

‎.github/workflows/pr-e2e-test.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (C) 2024 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33

4-
name: PR E2E test
4+
name: PR - E2E test
55

66
on:
77
pull_request:
@@ -16,9 +16,16 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
jobs:
19-
pr-image-build:
19+
pr-build-images:
2020
uses: ./.github/workflows/_build-image-to-registry.yml
2121
with:
22-
node: gaudi
22+
node: xeon
23+
tag: ${{ github.event_name == 'workflow_dispatch' && 'latest' || github.event.pull_request.head.sha }}
24+
secrets: inherit
25+
pr-run-e2e-test:
26+
uses: ./.github/workflows/_e2e-test.yml
27+
needs: pr-build-images
28+
with:
29+
node: xeon
2330
tag: ${{ github.event_name == 'workflow_dispatch' && 'latest' || github.event.pull_request.head.sha }}
2431
secrets: inherit

‎.github/workflows/weekly-trellix-scan.yml‎

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

4-
name: Weekly Trellix Scan
4+
name: Weekly - Trellix Scan
55

66
on:
77
workflow_dispatch:

0 commit comments

Comments
 (0)