Skip to content

Commit cd46aa7

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 cd46aa7

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

.ci/matrix_job.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,6 @@ steps:
209209
archiveArtifacts-onfail: |
210210
jenkins/**/arch-*.tar.gz
211211
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-
222212
- name: Style
223213
enable: ${do_style}
224214
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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ 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/BACKUP/logs_of_LOGS, hostPath: /auto/BACKUP/logs_of_LOGS}
26+
- {mountPath: /auto/GLIT/SCRIPTS/HELPERS, hostPath: /auto/GLIT/SCRIPTS/HELPERS}
2427

2528
runs_on_dockers:
2629
- {
@@ -47,6 +50,12 @@ steps:
4750
.ci/do_release.sh
4851
archiveArtifacts: "**/build_pkg.log,**/packages/*.rpm"
4952

53+
- name: Antivirus
54+
enable: ${do_antivirus}
55+
run: |
56+
env WORKSPACE=$PWD .ci/antivirus.sh ${release_folder}
57+
archiveArtifacts: 'logs/'
58+
5059
pipeline_start:
5160
shell: action
5261
module: groovy

0 commit comments

Comments
 (0)