Skip to content

Commit ba424fd

Browse files
committed
[CI] issue: 4705805 Add Blackduck to release job
Signed-off-by: Noam Tsemah <[email protected]>
1 parent 0dc96e0 commit ba424fd

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

.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_blackduck"
40+
default: false
41+
description: "Run BlackDuck."
3842
- string:
3943
name: "notification_email"
4044
default: "{jjb_release_email}"

.ci/pipeline/release_matrix_job.yaml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ kubernetes:
1616
nodeSelector: 'kubernetes.io/arch=amd64'
1717
jnlpImage: 'harbor.mellanox.com/toolbox/c3po-jnlp:latest'
1818

19+
credentials:
20+
- {credentialsId: 'swx-jenkins2-svc-gerrit-ssh-key', keyFileVariable: 'GERRIT_SSH_KEY', type: 'sshUserPrivateKey'}
21+
- {credentialsId: 'blackduck_api_token', type: 'string', variable: 'BLACKDUCK_API_TOKEN'}
22+
1923
env:
2024
MAIL_FROM: [email protected]
2125

@@ -37,14 +41,31 @@ runs_on_dockers:
3741
arch: 'x86_64',
3842
tag: '20250128'
3943
}
40-
44+
- {name: 'blackduck', file: '.ci/dockerfiles/Dockerfile.rhel8.6', category: 'tool', arch: 'x86_64', tag: '20250630', uri: 'vma/$arch/$name/bduck', build_args: '--no-cache --target bduck'}
45+
4146
steps:
4247
- name: Release
4348
parallel: false
49+
containerSelector:
50+
- "{name: 'rhel8.6', variant:1}"
4451
run: |
4552
.ci/do_release.sh
4653
archiveArtifacts: pkg/build_pkg.log,pkg/packages/*.rpm
4754

55+
- name: Blackduck
56+
enable: ${do_blackduck}
57+
containerSelector:
58+
- "{name: 'blackduck', category:'tool', variant:1}"
59+
run: |
60+
# WA for possible CI-Demo bug: HPCINFRA-1614
61+
if ${do_blackduck} ; then
62+
.ci/blackduck_source.sh
63+
fi
64+
archiveArtifacts: 'logs/'
65+
credentialsId:
66+
- "swx-jenkins2-svc-gerrit-ssh-key"
67+
- "blackduck_api_token"
68+
4869
pipeline_start:
4970
shell: action
5071
module: groovy

0 commit comments

Comments
 (0)