Skip to content

Commit 420c1b8

Browse files
committed
[CI] Move antivirus scan to release job
Move the antivirus scan step from the regular matrix file to the release matrix file Signed-off-by: Noam Tsemah <[email protected]>
1 parent b6c644a commit 420c1b8

File tree

4 files changed

+12
-18
lines changed

4 files changed

+12
-18
lines changed

.ci/matrix_job.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ volumes:
2626
- {mountPath: /auto/sw_tools/Commercial, hostPath: /auto/sw_tools/Commercial}
2727
- {mountPath: /hpc/local/commercial, hostPath: /hpc/local/commercial}
2828
- {mountPath: /hpc/local/etc/modulefiles, hostPath: /hpc/local/etc/modulefiles}
29-
# for Antivirus
30-
- {mountPath: /auto/BACKUP/logs_of_LOGS, hostPath: /auto/BACKUP/logs_of_LOGS}
31-
- {mountPath: /auto/GLIT/SCRIPTS/HELPERS, hostPath: /auto/GLIT/SCRIPTS/HELPERS}
3229
# Default release location
3330
- {mountPath: /auto/sw/release/sw_acceleration, hostPath: /auto/sw/release/sw_acceleration}
3431
# User profile for release
@@ -209,16 +206,6 @@ steps:
209206
archiveArtifacts-onfail: |
210207
jenkins/**/arch-*.tar.gz
211208
212-
- name: Antivirus
213-
enable: ${do_antivirus}
214-
containerSelector:
215-
- "{name: 'rhel8.3-mofed-x86_64', category: 'base', variant: 1}"
216-
agentSelector:
217-
- "{nodeLabel: 'skip-agent'}"
218-
run: |
219-
env WORKSPACE=$PWD .ci/antivirus.sh ${release_folder}
220-
archiveArtifacts: 'logs/'
221-
222209
- name: Style
223210
enable: ${do_style}
224211
containerSelector:

.ci/opensource_jjb.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@
5353
name: "do_package"
5454
default: true
5555
description: "Check tar, source and binary packages."
56-
- bool:
57-
name: "do_antivirus"
58-
default: false
59-
description: "Run Antivirus."
6056
- bool:
6157
name: "do_cppcheck"
6258
default: true

.ci/pipeline/release_jjb.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
name: "do_release"
3636
default: true
3737
description: "Release build packges into the release folder, set to false for debugging"
38+
- bool:
39+
name: "do_antivirus"
40+
default: true
41+
description: "Run Antivirus."
3842
- string:
3943
name: "notification_email"
4044
default: "{jjb_release_email}"

.ci/pipeline/release_matrix_job.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ volumes:
2121
- {mountPath: /auto/sw/release/sw_acceleration, hostPath: /auto/sw/release/sw_acceleration}
2222
# User profile for release
2323
- {mountPath: /var/home/swx-jenkins, hostPath: /labhome/swx-jenkins}
24+
# for Antivirus
25+
- {mountPath: /auto/GLIT/SCRIPTS/HELPERS, hostPath: /auto/GLIT/SCRIPTS/HELPERS}
2426

2527
runs_on_dockers:
2628
- {
@@ -32,7 +34,6 @@ runs_on_dockers:
3234
tag: '20250304'
3335
}
3436

35-
3637
steps:
3738
- name: Build-dpcp
3839
parallel: false
@@ -47,6 +48,12 @@ steps:
4748
.ci/do_release.sh
4849
archiveArtifacts: "**/build_pkg.log,**/packages/*.rpm"
4950

51+
- name: Antivirus
52+
enable: ${do_antivirus}
53+
run: |
54+
env WORKSPACE=$PWD .ci/antivirus.sh ${release_folder} ${release_tag}
55+
archiveArtifacts: 'logs/'
56+
5057
pipeline_start:
5158
shell: action
5259
module: groovy

0 commit comments

Comments
 (0)