Skip to content

Commit 3cea9a3

Browse files
xinredhatxinredhat
authored
Merge branch 'main' into konflux/mintmaker/main/github.com-containerd-cgroups-v3-3.x
2 parents 4630da3 + 6585a09 commit 3cea9a3

File tree

10 files changed

+343
-204
lines changed

10 files changed

+343
-204
lines changed

‎.tekton/rhtap-task-runner-pull-request.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ spec:
148148
- name: name
149149
value: init
150150
- name: bundle
151-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
151+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
152152
- name: kind
153153
value: task
154154
resolver: bundles
@@ -169,7 +169,7 @@ spec:
169169
- name: name
170170
value: git-clone-oci-ta
171171
- name: bundle
172-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0d80f66610efd1f957700f61dcd5080689321b10ad544e136d58fc4673290d1b
172+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3dc39eae48745a96097c07c577b944d6203a91c35d3f71d9ed5feab41d327a6a
173173
- name: kind
174174
value: task
175175
resolver: bundles
@@ -200,7 +200,7 @@ spec:
200200
- name: name
201201
value: prefetch-dependencies-oci-ta
202202
- name: bundle
203-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
203+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:5946ca57aa29f162e11b74984ec58960f55f9fb6a0e97c6c9215c4161f768726
204204
- name: kind
205205
value: task
206206
resolver: bundles
@@ -243,7 +243,7 @@ spec:
243243
- name: name
244244
value: buildah-oci-ta
245245
- name: bundle
246-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:38d08ea58511a67f8754dc025feebdec8ae342fb4e25bc67a3726ec84f7cb7d1
246+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.6@sha256:27b04ea788cf64fd38c7d151feb5e1ca408804fa5a70cf704ae746a086ee92b8
247247
- name: kind
248248
value: task
249249
resolver: bundles
@@ -274,7 +274,7 @@ spec:
274274
- name: name
275275
value: build-image-index
276276
- name: bundle
277-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
277+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
278278
- name: kind
279279
value: task
280280
resolver: bundles
@@ -300,7 +300,7 @@ spec:
300300
- name: name
301301
value: source-build-oci-ta
302302
- name: bundle
303-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:36d44f2924f60da00a079a9ab7ce25ad8b2ad593c16d90509203c125ff0ccd46
303+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:282cb5a9119a87e88559444feff67d76d6f356d03654b4845632c049b2314735
304304
- name: kind
305305
value: task
306306
resolver: bundles
@@ -326,7 +326,7 @@ spec:
326326
- name: name
327327
value: deprecated-image-check
328328
- name: bundle
329-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
329+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:462baed733dfc38aca5395499e92f19b6f13a74c2e88fe5d86c3cffa2f899b57
330330
- name: kind
331331
value: task
332332
resolver: bundles
@@ -348,7 +348,7 @@ spec:
348348
- name: name
349349
value: clair-scan
350350
- name: bundle
351-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
351+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8ec7d7b9438ace5ef3fb03a533d9440d0fd81e51c73b0dc1eb51602fb7cd044e
352352
- name: kind
353353
value: task
354354
resolver: bundles
@@ -368,7 +368,7 @@ spec:
368368
- name: name
369369
value: ecosystem-cert-preflight-checks
370370
- name: bundle
371-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
371+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
372372
- name: kind
373373
value: task
374374
resolver: bundles
@@ -394,7 +394,7 @@ spec:
394394
- name: name
395395
value: sast-snyk-check-oci-ta
396396
- name: bundle
397-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
397+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:8ad28b7783837a24acbc9a8494c935e796e591ce476085ad5899bebd7e53f077
398398
- name: kind
399399
value: task
400400
resolver: bundles
@@ -420,7 +420,7 @@ spec:
420420
- name: name
421421
value: sast-shell-check-oci-ta
422422
- name: bundle
423-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
423+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:d44336d7bcbd1f7cedee639357a493bd1f661e2859e49e11a34644bdf6819c4e
424424
- name: kind
425425
value: task
426426
resolver: bundles
@@ -446,7 +446,7 @@ spec:
446446
- name: name
447447
value: sast-unicode-check-oci-ta
448448
- name: bundle
449-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
449+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:e5a8d3e8e7be7246a1460385b95c084ea6e8fe7520d40fe4389deb90f1bf5176
450450
- name: kind
451451
value: task
452452
resolver: bundles
@@ -468,7 +468,7 @@ spec:
468468
- name: name
469469
value: clamav-scan
470470
- name: bundle
471-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
471+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:f3d2d179cddcc07d0228d9f52959a233037a3afa2619d0a8b2effbb467db80c3
472472
- name: kind
473473
value: task
474474
resolver: bundles
@@ -490,7 +490,7 @@ spec:
490490
- name: name
491491
value: apply-tags
492492
- name: bundle
493-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:f44be1bf0262471f2f503f5e19da5f0628dcaf968c86272a2ad6b4871e708448
493+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:4c2b0a2d2904108f8d19edfa878df6cd49ed19aab73ab6fc6a435fba0265f771
494494
- name: kind
495495
value: task
496496
resolver: bundles
@@ -513,7 +513,7 @@ spec:
513513
- name: name
514514
value: push-dockerfile-oci-ta
515515
- name: bundle
516-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:2bc5b3afc5de56da0f06eac60b65e86f6b861b16a63f48579fc0bac7d657e14c
516+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:13633d5ba8445c0f732a0a5d1b33ffbb708398e45ef1647542b0ab22fee25a6a
517517
- name: kind
518518
value: task
519519
resolver: bundles

‎.tekton/rhtap-task-runner-push.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ spec:
145145
- name: name
146146
value: init
147147
- name: bundle
148-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
148+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
149149
- name: kind
150150
value: task
151151
resolver: bundles
@@ -166,7 +166,7 @@ spec:
166166
- name: name
167167
value: git-clone-oci-ta
168168
- name: bundle
169-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0d80f66610efd1f957700f61dcd5080689321b10ad544e136d58fc4673290d1b
169+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3dc39eae48745a96097c07c577b944d6203a91c35d3f71d9ed5feab41d327a6a
170170
- name: kind
171171
value: task
172172
resolver: bundles
@@ -197,7 +197,7 @@ spec:
197197
- name: name
198198
value: prefetch-dependencies-oci-ta
199199
- name: bundle
200-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
200+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:5946ca57aa29f162e11b74984ec58960f55f9fb6a0e97c6c9215c4161f768726
201201
- name: kind
202202
value: task
203203
resolver: bundles
@@ -240,7 +240,7 @@ spec:
240240
- name: name
241241
value: buildah-oci-ta
242242
- name: bundle
243-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:38d08ea58511a67f8754dc025feebdec8ae342fb4e25bc67a3726ec84f7cb7d1
243+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.6@sha256:27b04ea788cf64fd38c7d151feb5e1ca408804fa5a70cf704ae746a086ee92b8
244244
- name: kind
245245
value: task
246246
resolver: bundles
@@ -271,7 +271,7 @@ spec:
271271
- name: name
272272
value: build-image-index
273273
- name: bundle
274-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
274+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
275275
- name: kind
276276
value: task
277277
resolver: bundles
@@ -297,7 +297,7 @@ spec:
297297
- name: name
298298
value: source-build-oci-ta
299299
- name: bundle
300-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:36d44f2924f60da00a079a9ab7ce25ad8b2ad593c16d90509203c125ff0ccd46
300+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:282cb5a9119a87e88559444feff67d76d6f356d03654b4845632c049b2314735
301301
- name: kind
302302
value: task
303303
resolver: bundles
@@ -323,7 +323,7 @@ spec:
323323
- name: name
324324
value: deprecated-image-check
325325
- name: bundle
326-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
326+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:462baed733dfc38aca5395499e92f19b6f13a74c2e88fe5d86c3cffa2f899b57
327327
- name: kind
328328
value: task
329329
resolver: bundles
@@ -345,7 +345,7 @@ spec:
345345
- name: name
346346
value: clair-scan
347347
- name: bundle
348-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
348+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8ec7d7b9438ace5ef3fb03a533d9440d0fd81e51c73b0dc1eb51602fb7cd044e
349349
- name: kind
350350
value: task
351351
resolver: bundles
@@ -365,7 +365,7 @@ spec:
365365
- name: name
366366
value: ecosystem-cert-preflight-checks
367367
- name: bundle
368-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
368+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
369369
- name: kind
370370
value: task
371371
resolver: bundles
@@ -391,7 +391,7 @@ spec:
391391
- name: name
392392
value: sast-snyk-check-oci-ta
393393
- name: bundle
394-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
394+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:8ad28b7783837a24acbc9a8494c935e796e591ce476085ad5899bebd7e53f077
395395
- name: kind
396396
value: task
397397
resolver: bundles
@@ -417,7 +417,7 @@ spec:
417417
- name: name
418418
value: sast-shell-check-oci-ta
419419
- name: bundle
420-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
420+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:d44336d7bcbd1f7cedee639357a493bd1f661e2859e49e11a34644bdf6819c4e
421421
- name: kind
422422
value: task
423423
resolver: bundles
@@ -443,7 +443,7 @@ spec:
443443
- name: name
444444
value: sast-unicode-check-oci-ta
445445
- name: bundle
446-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
446+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:e5a8d3e8e7be7246a1460385b95c084ea6e8fe7520d40fe4389deb90f1bf5176
447447
- name: kind
448448
value: task
449449
resolver: bundles
@@ -465,7 +465,7 @@ spec:
465465
- name: name
466466
value: clamav-scan
467467
- name: bundle
468-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
468+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:f3d2d179cddcc07d0228d9f52959a233037a3afa2619d0a8b2effbb467db80c3
469469
- name: kind
470470
value: task
471471
resolver: bundles
@@ -487,7 +487,7 @@ spec:
487487
- name: name
488488
value: apply-tags
489489
- name: bundle
490-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:f44be1bf0262471f2f503f5e19da5f0628dcaf968c86272a2ad6b4871e708448
490+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:4c2b0a2d2904108f8d19edfa878df6cd49ed19aab73ab6fc6a435fba0265f771
491491
- name: kind
492492
value: task
493493
resolver: bundles
@@ -510,7 +510,7 @@ spec:
510510
- name: name
511511
value: push-dockerfile-oci-ta
512512
- name: bundle
513-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:2bc5b3afc5de56da0f06eac60b65e86f6b861b16a63f48579fc0bac7d657e14c
513+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:13633d5ba8445c0f732a0a5d1b33ffbb708398e45ef1647542b0ab22fee25a6a
514514
- name: kind
515515
value: task
516516
resolver: bundles

‎generated/gitops-template/jenkins/Jenkinsfile‎

Lines changed: 60 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,86 @@
11
/* Generated from templates/gitops-template/Jenkinsfile.njk. Do not edit directly. */
22

3-
library identifier: 'RHTAP_Jenkins@main', retriever: modernSCM(
4-
[$class: 'GitSCMSource',
5-
remote: 'https://github.com/redhat-appstudio/tssc-sample-jenkins.git'])
6-
73
pipeline {
8-
agent any
4+
agent {
5+
kubernetes {
6+
yaml """
7+
apiVersion: v1
8+
kind: Pod
9+
spec:
10+
containers:
11+
- name: 'runner'
12+
image: 'quay.io/redhat-appstudio/rhtap-task-runner:latest'
13+
securityContext:
14+
privileged: true
15+
"""
16+
}
17+
}
918
environment {
10-
/* Not used but init.sh will fail if they're missing */
11-
COSIGN_SECRET_PASSWORD = 'dummy'
12-
COSIGN_SECRET_KEY = 'dummy'
19+
HOME = "${WORKSPACE}"
20+
DOCKER_CONFIG = "${WORKSPACE}/.docker"
21+
ROX_CENTRAL_ENDPOINT = credentials('ROX_CENTRAL_ENDPOINT')
1322
/* Used to verify the image signature and attestation */
14-
/* COSIGN_PUBLIC_KEY = credentials('COSIGN_PUBLIC_KEY') */
23+
COSIGN_PUBLIC_KEY = credentials('COSIGN_PUBLIC_KEY')
1524
/* URL of the BOMbastic api host (e.g. https://sbom.trustification.dev) */
16-
/* TRUSTIFICATION_BOMBASTIC_API_URL = credentials('TRUSTIFICATION_BOMBASTIC_API_URL') */
25+
TRUSTIFICATION_BOMBASTIC_API_URL = credentials('TRUSTIFICATION_BOMBASTIC_API_URL')
1726
/* URL of the OIDC token issuer (e.g. https://sso.trustification.dev/realms/chicken) */
18-
/* TRUSTIFICATION_OIDC_ISSUER_URL = credentials('TRUSTIFICATION_OIDC_ISSUER_URL') */
19-
/* TRUSTIFICATION_OIDC_CLIENT_ID = credentials('TRUSTIFICATION_OIDC_CLIENT_ID') */
20-
/* TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION = credentials('TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION') */
21-
/* Set when using Jenkins on non-local cluster and using an external Rekor instance */
22-
/* REKOR_HOST = credentials('REKOR_HOST') */
23-
/* Set when using Jenkins on non-local cluster and using an external TUF instance */
24-
/* TUF_MIRROR = credentials('TUF_MIRROR') */
27+
TRUSTIFICATION_OIDC_ISSUER_URL = credentials('TRUSTIFICATION_OIDC_ISSUER_URL')
28+
TRUSTIFICATION_OIDC_CLIENT_ID = credentials('TRUSTIFICATION_OIDC_CLIENT_ID')
29+
TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION = credentials('TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION')
2530
/* Set this to the user for your specific registry */
26-
/* IMAGE_REGISTRY_USER = credentials('IMAGE_REGISTRY_USER') */
31+
IMAGE_REGISTRY_USER = credentials('IMAGE_REGISTRY_USER')
32+
REKOR_HOST = credentials('REKOR_HOST')
33+
TUF_MIRROR = credentials('TUF_MIRROR')
2734
TRUSTIFICATION_OIDC_CLIENT_SECRET = credentials('TRUSTIFICATION_OIDC_CLIENT_SECRET')
2835
/* Set this password for your specific registry */
29-
/* IMAGE_REGISTRY_PASSWORD = credentials('IMAGE_REGISTRY_PASSWORD') */
36+
IMAGE_REGISTRY_PASSWORD = credentials('IMAGE_REGISTRY_PASSWORD')
3037
QUAY_IO_CREDS = credentials('QUAY_IO_CREDS')
3138
/* ARTIFACTORY_IO_CREDS = credentials('ARTIFACTORY_IO_CREDS') */
3239
/* NEXUS_IO_CREDS = credentials('NEXUS_IO_CREDS') */
40+
COSIGN_SECRET_PASSWORD = credentials('COSIGN_SECRET_PASSWORD')
41+
COSIGN_SECRET_KEY = credentials('COSIGN_SECRET_KEY')
42+
ROX_API_TOKEN = credentials('ROX_API_TOKEN')
43+
GITOPS_AUTH_PASSWORD = credentials('GITOPS_AUTH_PASSWORD')
3344
}
3445
stages {
46+
stage('init') {
47+
steps {
48+
container('runner') {
49+
sh '''
50+
cp -R /work/* .
51+
env
52+
git config --global --add safe.directory $WORKSPACE
53+
chmod +x ./rhtap/gather-images-to-upload-sbom.sh
54+
echo "running init"
55+
./rhtap/init.sh
56+
'''
57+
}
58+
}
59+
}
3560
stage('Verify EC') {
3661
steps {
37-
script {
38-
rhtap.info('gather_deploy_images')
39-
rhtap.gather_deploy_images()
40-
rhtap.info('verify_enterprise_contract')
41-
rhtap.verify_enterprise_contract()
62+
container('runner') {
63+
sh '''
64+
echo "running gather-deploy-images"
65+
./rhtap/gather-deploy-images.sh
66+
echo "running verify-enterprise-contract"
67+
./rhtap/verify-enterprise-contract.sh
68+
'''
4269
}
4370
}
4471
}
4572

4673
stage('Upload SBOM') {
4774
steps {
48-
script {
49-
rhtap.info('gather_images_to_upload_sbom')
50-
rhtap.gather_images_to_upload_sbom()
51-
rhtap.info('download_sbom_from_url_in_attestation')
52-
rhtap.download_sbom_from_url_in_attestation()
53-
rhtap.info('upload_sbom_to_trustification')
54-
rhtap.upload_sbom_to_trustification()
75+
container('runner') {
76+
sh '''
77+
echo "running gather-images-to-upload-sbom"
78+
./rhtap/gather-images-to-upload-sbom.sh
79+
echo "running download-sbom-from-url-in-attestation"
80+
./rhtap/download-sbom-from-url-in-attestation.sh
81+
echo "running upload-sbom-to-trustification"
82+
./rhtap/upload-sbom-to-trustification.sh
83+
'''
5584
}
5685
}
5786
}

0 commit comments

Comments
 (0)