Skip to content

Commit ada8932

Browse files
authored
Merge pull request #1886 from syedriko/syedriko-lightspeed-stack-0-5-fix
LCORE-1935: Fix the lightspeed-stack-0-5 Konflux component pipelines
2 parents 15dcf01 + 581fb1f commit ada8932

2 files changed

Lines changed: 283 additions & 89 deletions

File tree

.tekton/lightspeed-stack-0-5-pull-request.yaml

Lines changed: 144 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,49 @@ spec:
2323
- name: revision
2424
value: '{{revision}}'
2525
- name: output-image
26-
value: quay.io/redhat-user-workloads/lightspeed-core-tenant/lightspeed-core-0-5/lightspeed-stack-0-5:on-pr-{{revision}}
26+
value: quay.io/redhat-user-workloads/lightspeed-core-tenant/lightspeed-stack-0-5:on-pr-{{revision}}
2727
- name: image-expires-after
2828
value: 5d
2929
- name: build-platforms
3030
value:
3131
- linux/x86_64
32+
- linux-c6gd2xlarge/arm64
33+
- name: build-source-image
34+
value: 'true'
35+
- name: prefetch-input
36+
value: |
37+
[
38+
{
39+
"type": "rpm",
40+
"path": "."
41+
},
42+
{
43+
"type": "generic",
44+
"path": "."
45+
},
46+
{
47+
"type": "pip",
48+
"path": ".",
49+
"requirements_files": [
50+
"requirements.hashes.wheel.txt",
51+
"requirements.hashes.source.txt",
52+
"requirements.hermetic.txt"
53+
],
54+
"requirements_build_files": ["requirements-build.txt"],
55+
"binary": {
56+
"packages": "aiohappyeyeballs,aiohttp,aiosignal,aiosqlite,annotated-doc,annotated-types,anyio,asyncpg,cffi,chevron,click,cryptography,datasets,dill,distro,dnspython,docstring-parser,durationpy,einops,email-validator,faiss-cpu,fire,frozenlist,fsspec,google-cloud-core,google-crc32c,google-genai,google-resumable-media,grpc-google-iam-v1,grpcio,grpcio-status,h11,hf-xet,httpcore,httpx,httpx-sse,idna,importlib-metadata,jinja2,jiter,joblib,jsonschema,jsonschema-specifications,kubernetes,lxml,markdown-it-py,mcp,mdurl,mpmath,multidict,networkx,numpy,oauthlib,packaging,pandas,peft,pillow,prometheus-client,prompt-toolkit,propcache,psycopg2-binary,pyarrow,pyasn1-modules,pycparser,pydantic,pydantic-core,pygments,python-dateutil,python-multipart,pyyaml,referencing,requests-oauthlib,rpds-py,safetensors,scikit-learn,scipy,setuptools,six,sniffio,sqlalchemy,sympy,termcolor,threadpoolctl,tiktoken,tokenizers,torch,tqdm,transformers,tree-sitter,triton,typing-extensions,typing-inspection,tzdata,urllib3,websocket-client,websockets,wrapt,xxhash,yarl,zipp,uv,pip,maturin",
57+
"os": "linux",
58+
"arch": "x86_64,aarch64",
59+
"py_version": 312
60+
}
61+
}
62+
]
63+
- name: hermetic
64+
value: 'true'
3265
- name: dockerfile
3366
value: Containerfile
34-
- name: path-context
35-
value: .
67+
- name: build-args-file
68+
value: build-args-konflux.conf
3669
pipelineSpec:
3770
description: |
3871
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
@@ -51,13 +84,11 @@ spec:
5184
name: output-image
5285
type: string
5386
- default: .
54-
description: Path to the source code of an application's component from where
55-
to build image.
87+
description: Path to the source code of an application's component from where to build image.
5688
name: path-context
5789
type: string
5890
- default: Dockerfile
59-
description: Path to the Dockerfile inside the context specified by parameter
60-
path-context
91+
description: Path to the Dockerfile inside the context specified by parameter path-context
6192
name: dockerfile
6293
type: string
6394
- default: "false"
@@ -73,8 +104,7 @@ spec:
73104
name: prefetch-input
74105
type: string
75106
- default: ""
76-
description: Image tag expiration time, time values could be something like
77-
1h, 2d, 3w for hours, days, and weeks, respectively.
107+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
78108
name: image-expires-after
79109
type: string
80110
- default: "false"
@@ -86,21 +116,9 @@ spec:
86116
name: build-image-index
87117
type: string
88118
- default: docker
89-
description: The format for the resulting image's mediaType. Valid values are
90-
oci or docker.
119+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
91120
name: buildah-format
92121
type: string
93-
- default: "false"
94-
description: Enable cache proxy configuration
95-
name: enable-cache-proxy
96-
- default: "true"
97-
description: Use the package registry proxy when prefetching dependencies
98-
name: enable-package-registry-proxy
99-
- default: .
100-
description: Target directories in component's source code to scan with SAST
101-
tools. Multiple values should be separated with commas.
102-
name: sast-target-dirs
103-
type: string
104122
- default: []
105123
description: Array of --build-arg values ("arg=value" strings) for buildah
106124
name: build-args
@@ -110,16 +128,26 @@ spec:
110128
name: build-args-file
111129
type: string
112130
- default: "false"
113-
description: Whether to enable privileged mode, should be used only with remote
114-
VMs
131+
description: Whether to enable privileged mode, should be used only with remote VMs
115132
name: privileged-nested
116133
type: string
117134
- default:
118135
- linux/x86_64
119-
description: List of platforms to build the container images on. The available
120-
set of values is determined by the configuration of the multi-platform-controller.
136+
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
121137
name: build-platforms
122138
type: array
139+
- name: enable-cache-proxy
140+
default: 'false'
141+
description: Enable cache proxy configuration
142+
type: string
143+
- name: enable-package-registry-proxy
144+
default: 'true'
145+
description: Use the package registry proxy when prefetching dependencies
146+
type: string
147+
- name: sast-target-dirs
148+
type: string
149+
default: .
150+
description: Target directories to scan with SAST tools. Multiple values should be separated with commas.
123151
results:
124152
- description: ""
125153
name: IMAGE_URL
@@ -175,22 +203,22 @@ spec:
175203
params:
176204
- name: input
177205
value: $(params.prefetch-input)
178-
- name: enable-package-registry-proxy
179-
value: $(params.enable-package-registry-proxy)
180206
- name: SOURCE_ARTIFACT
181207
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
182208
- name: ociStorage
183209
value: $(params.output-image).prefetch
184210
- name: ociArtifactExpiresAfter
185211
value: $(params.image-expires-after)
212+
- name: enable-package-registry-proxy
213+
value: $(params.enable-package-registry-proxy)
186214
runAfter:
187215
- clone-repository
188216
taskRef:
189217
params:
190218
- name: name
191219
value: prefetch-dependencies-oci-ta
192220
- name: bundle
193-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:0e6324edd0e6733a8c3400f46c4a638ed2f27063376f25a6f2b0220fca04ab77
221+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:3dc78afbf3a441e0280067433cb28ea3d2d0088ec214c73bf063f145b4f273ef
194222
- name: kind
195223
value: task
196224
resolver: bundles
@@ -231,24 +259,24 @@ spec:
231259
value: $(tasks.clone-repository.results.url)
232260
- name: BUILDAH_FORMAT
233261
value: $(params.buildah-format)
234-
- name: HTTP_PROXY
235-
value: $(tasks.init.results.http-proxy)
236-
- name: NO_PROXY
237-
value: $(tasks.init.results.no-proxy)
238262
- name: SOURCE_ARTIFACT
239263
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
240264
- name: CACHI2_ARTIFACT
241265
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
242266
- name: IMAGE_APPEND_PLATFORM
243267
value: "true"
268+
- name: HTTP_PROXY
269+
value: $(tasks.init.results.http-proxy)
270+
- name: NO_PROXY
271+
value: $(tasks.init.results.no-proxy)
244272
runAfter:
245273
- prefetch-dependencies
246274
taskRef:
247275
params:
248276
- name: name
249277
value: buildah-remote-oci-ta
250278
- name: bundle
251-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.10@sha256:41f3f361785550b378b50b8ce42870092026ae413c723c738c496a75587eff82
279+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.9@sha256:77007259cc87f32d63d2c201226aadaab98313cfd4e02b46abc243c4d2cc27bd
252280
- name: kind
253281
value: task
254282
resolver: bundles
@@ -380,20 +408,22 @@ spec:
380408
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
381409
- name: image-url
382410
value: $(tasks.build-image-index.results.IMAGE_URL)
383-
- name: TARGET_DIRS
384-
value: $(params.sast-target-dirs)
385411
- name: SOURCE_ARTIFACT
386412
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
387413
- name: CACHI2_ARTIFACT
388414
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
415+
- name: ARGS
416+
value: --project-name=lightspeed-stack --report --org=dca2ca89-7e51-4a3a-b7a5-6ad5633057b8
417+
- name: TARGET_DIRS
418+
value: $(params.sast-target-dirs)
389419
runAfter:
390420
- build-image-index
391421
taskRef:
392422
params:
393423
- name: name
394424
value: sast-snyk-check-oci-ta
395425
- name: bundle
396-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:8f3ecbeaff579e41b8278f82d7fabac27845db17a8e687ea6c510c0c9aceabbb
426+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:0ebf28a0abd5a167438d4628938a74ade6f00a44a4b7ed1cfa9cfc57a5b24748
397427
- name: kind
398428
value: task
399429
resolver: bundles
@@ -429,26 +459,94 @@ spec:
429459
operator: in
430460
values:
431461
- "false"
432-
- name: sast-shell-check
462+
- name: sast-coverity-check
433463
params:
434464
- name: image-digest
435465
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
436466
- name: image-url
437467
value: $(tasks.build-image-index.results.IMAGE_URL)
468+
- name: IMAGE
469+
value: $(params.output-image)
470+
- name: DOCKERFILE
471+
value: $(params.dockerfile)
472+
- name: CONTEXT
473+
value: $(params.path-context)
474+
- name: HERMETIC
475+
value: $(params.hermetic)
476+
- name: PREFETCH_INPUT
477+
value: $(params.prefetch-input)
478+
- name: IMAGE_EXPIRES_AFTER
479+
value: $(params.image-expires-after)
480+
- name: COMMIT_SHA
481+
value: $(tasks.clone-repository.results.commit)
482+
- name: BUILD_ARGS
483+
value:
484+
- $(params.build-args[*])
485+
- name: BUILD_ARGS_FILE
486+
value: $(params.build-args-file)
487+
- name: SOURCE_ARTIFACT
488+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
489+
- name: CACHI2_ARTIFACT
490+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
438491
- name: TARGET_DIRS
439492
value: $(params.sast-target-dirs)
493+
runAfter:
494+
- coverity-availability-check
495+
taskRef:
496+
params:
497+
- name: name
498+
value: sast-coverity-check-oci-ta
499+
- name: bundle
500+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:e92d00ed858233d0096627861192d3e4fc013cf1559c0d0b0ea0657d3377ce75
501+
- name: kind
502+
value: task
503+
resolver: bundles
504+
when:
505+
- input: $(params.skip-checks)
506+
operator: in
507+
values:
508+
- "false"
509+
- input: $(tasks.coverity-availability-check.results.STATUS)
510+
operator: in
511+
values:
512+
- success
513+
- name: coverity-availability-check
514+
runAfter:
515+
- build-image-index
516+
taskRef:
517+
params:
518+
- name: name
519+
value: coverity-availability-check
520+
- name: bundle
521+
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:8b501440a960aec446db2ebc6625a49d0317a9fc7bf0f7bd9b18cb63052db7de
522+
- name: kind
523+
value: task
524+
resolver: bundles
525+
when:
526+
- input: $(params.skip-checks)
527+
operator: in
528+
values:
529+
- "false"
530+
- name: sast-shell-check
531+
params:
532+
- name: image-digest
533+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
534+
- name: image-url
535+
value: $(tasks.build-image-index.results.IMAGE_URL)
440536
- name: SOURCE_ARTIFACT
441537
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
442538
- name: CACHI2_ARTIFACT
443539
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
540+
- name: TARGET_DIRS
541+
value: $(params.sast-target-dirs)
444542
runAfter:
445543
- build-image-index
446544
taskRef:
447545
params:
448546
- name: name
449547
value: sast-shell-check-oci-ta
450548
- name: bundle
451-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:c4ef47e3b4e0508572d266fb745be7e374c29dc02580328cbe9f4d472a8aca57
549+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:3cbb3535af6e7d4396858179a6427caaffb2e68775594795692fc01f28ae313f
452550
- name: kind
453551
value: task
454552
resolver: bundles
@@ -463,20 +561,20 @@ spec:
463561
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
464562
- name: image-url
465563
value: $(tasks.build-image-index.results.IMAGE_URL)
466-
- name: TARGET_DIRS
467-
value: $(params.sast-target-dirs)
468564
- name: SOURCE_ARTIFACT
469565
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
470566
- name: CACHI2_ARTIFACT
471567
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
568+
- name: TARGET_DIRS
569+
value: $(params.sast-target-dirs)
472570
runAfter:
473571
- build-image-index
474572
taskRef:
475573
params:
476574
- name: name
477575
value: sast-unicode-check-oci-ta
478576
- name: bundle
479-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:90efa582de7770d55102b74014a765cd16a25a56f2cf644b56a788c70c4dc749
577+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:223812001607b07f0e07d56bef7b7d619144e660c0c57f21ddd44ce0c8c4785b
480578
- name: kind
481579
value: task
482580
resolver: bundles
@@ -538,7 +636,7 @@ spec:
538636
- name: name
539637
value: rpms-signature-scan
540638
- name: bundle
541-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:41720da9dfe26f33b0bdc46bbf8667a27dae4790d8e5c5f4412224658de7b213
639+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:237c54b069d16c3785d1302f19be309aa6c0ae2313d446e30cb74671e07ca676
542640
- name: kind
543641
value: task
544642
resolver: bundles
@@ -552,6 +650,9 @@ spec:
552650
optional: true
553651
- name: netrc
554652
optional: true
653+
timeouts:
654+
pipeline: 4h
655+
tasks: 4h
555656
taskRunTemplate:
556657
serviceAccountName: build-pipeline-lightspeed-stack-0-5
557658
workspaces:

0 commit comments

Comments
 (0)