Skip to content

Commit f07d01f

Browse files
authored
feat: offboard sealights from konflux ci (#250)
Signed-off-by: flacatus <flacatus@redhat.com>
1 parent 8dedd15 commit f07d01f

File tree

3 files changed

+6
-137
lines changed

3 files changed

+6
-137
lines changed

.tekton/image-controller-pull-request.yaml

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -173,49 +173,18 @@ spec:
173173
workspaces:
174174
- name: basic-auth
175175
workspace: git-auth
176-
- name: sealights-go-instrumentation
177-
params:
178-
- name: SOURCE_ARTIFACT
179-
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
180-
- name: component
181-
value: '{{ repo_name }}'
182-
- name: branch
183-
value: '{{ source_branch }}'
184-
- name: revision
185-
value: '{{ revision }}'
186-
- name: repository-url
187-
value: '{{ repo_url }}'
188-
- name: pull-request-number
189-
value: '{{ pull_request_number }}'
190-
- name: target-branch
191-
value: '{{ target_branch }}'
192-
- name: oci-storage
193-
value: $(params.output-image).sealights.git
194-
- name: disable-token-save
195-
value: 'true'
196-
runAfter:
197-
- clone-repository
198-
taskRef:
199-
params:
200-
- name: name
201-
value: sealights-go-oci-ta
202-
- name: bundle
203-
value: quay.io/konflux-ci/tekton-catalog/task-sealights-go-oci-ta:0.1@sha256:ce75fd9d498365a9c1e42f8340cc3e7d09a68ab312588905d169964055f092b2
204-
- name: kind
205-
value: task
206-
resolver: bundles
207176
- name: prefetch-dependencies
208177
params:
209178
- name: input
210179
value: $(params.prefetch-input)
211180
- name: SOURCE_ARTIFACT
212-
value: $(tasks.sealights-go-instrumentation.results.SOURCE_ARTIFACT)
181+
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
213182
- name: ociStorage
214183
value: $(params.output-image).prefetch
215184
- name: ociArtifactExpiresAfter
216185
value: $(params.image-expires-after)
217186
runAfter:
218-
- sealights-go-instrumentation
187+
- clone-repository
219188
taskRef:
220189
params:
221190
- name: name

.tekton/image-controller-push.yaml

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -170,31 +170,6 @@ spec:
170170
workspaces:
171171
- name: basic-auth
172172
workspace: git-auth
173-
- name: sealights-go-instrumentation
174-
params:
175-
- name: SOURCE_ARTIFACT
176-
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
177-
- name: component
178-
value: '{{ repo_name }}'
179-
- name: branch
180-
value: '{{ source_branch }}'
181-
- name: revision
182-
value: '{{ revision }}'
183-
- name: oci-storage
184-
value: $(params.output-image).sealights.git
185-
- name: disable-token-save
186-
value: 'true'
187-
runAfter:
188-
- clone-repository
189-
taskRef:
190-
params:
191-
- name: name
192-
value: sealights-go-oci-ta
193-
- name: bundle
194-
value: quay.io/konflux-ci/tekton-catalog/task-sealights-go-oci-ta:0.1@sha256:ce75fd9d498365a9c1e42f8340cc3e7d09a68ab312588905d169964055f092b2
195-
- name: kind
196-
value: task
197-
resolver: bundles
198173
- name: prefetch-dependencies
199174
params:
200175
- name: input
@@ -267,48 +242,6 @@ spec:
267242
operator: in
268243
values:
269244
- 'true'
270-
- name: build-sealights-container
271-
params:
272-
- name: IMAGE
273-
value: $(params.output-image).sealights
274-
- name: DOCKERFILE
275-
value: $(params.dockerfile)
276-
- name: CONTEXT
277-
value: $(params.path-context)
278-
- name: HERMETIC
279-
value: $(params.hermetic)
280-
- name: PREFETCH_INPUT
281-
value: $(params.prefetch-input)
282-
- name: IMAGE_EXPIRES_AFTER
283-
value: $(params.image-expires-after)
284-
- name: COMMIT_SHA
285-
value: $(tasks.clone-repository.results.commit)
286-
- name: BUILD_ARGS
287-
value:
288-
- $(params.build-args[*])
289-
- name: BUILD_ARGS_FILE
290-
value: $(params.build-args-file)
291-
- name: SOURCE_ARTIFACT
292-
value: $(tasks.sealights-go-instrumentation.results.SOURCE_ARTIFACT)
293-
- name: CACHI2_ARTIFACT
294-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
295-
runAfter:
296-
- prefetch-dependencies
297-
- sealights-go-instrumentation
298-
taskRef:
299-
params:
300-
- name: name
301-
value: buildah-oci-ta
302-
- name: bundle
303-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:820e397596f9816c953e16328afa496337a2ede6b457fe600a40d44ebca5a16f
304-
- name: kind
305-
value: task
306-
resolver: bundles
307-
when:
308-
- input: $(tasks.init.results.build)
309-
operator: in
310-
values:
311-
- 'true'
312245
- name: build-image-index
313246
params:
314247
- name: IMAGE

integration-tests/pipelines/konflux-e2e-tests.yaml

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ spec:
1717
- name: test-name
1818
description: 'The name of the test corresponding to a defined Konflux integration test.'
1919
default: ''
20-
- name: test-stage
21-
default: 'image-controller-e2e'
22-
description: >-
23-
"The name or identifier of the testing phase (e.g., "integration", "e2e") during which the results
24-
are being captured. This helps distinguish the test results within Sealights for better reporting and traceability"
2520
- name: ocp-version
2621
description: 'The OpenShift version to use for the ephemeral cluster deployment.'
2722
type: string
@@ -41,30 +36,11 @@ spec:
4136
default: 'none'
4237
description: 'Container image built from any konflux git repo. Use this param only when you run Konflux e2e tests
4338
in another Konflux component repo. Will pass the component built image from the snapshot.'
44-
- name: enable-sl-plugin
45-
description: "A flag to enable or disable the Sealights integration feature. When set to 'true', test results are sent to Sealights for analysis; otherwise, this feature is skipped."
46-
default: "true"
47-
- name: enable-sealights
48-
description: "A flag to enable sealights integration"
49-
default: "true"
5039
- name: artifact-browser-url
5140
description: "URL to the artifact browser deployment. If provided, a link will be added to PR comments."
5241
default: ""
5342
type: string
5443
tasks:
55-
- name: sealights-refs
56-
taskRef:
57-
resolver: git
58-
params:
59-
- name: url
60-
value: https://github.com/konflux-ci/tekton-integration-catalog.git
61-
- name: revision
62-
value: main
63-
- name: pathInRepo
64-
value: tasks/sealights/sealights-get-refs/0.1/sealights-get-refs.yaml
65-
params:
66-
- name: SNAPSHOT
67-
value: $(params.SNAPSHOT)
6844
- name: test-metadata
6945
taskRef:
7046
resolver: git
@@ -74,15 +50,14 @@ spec:
7450
- name: revision
7551
value: main
7652
- name: pathInRepo
77-
value: tasks/test-metadata/0.1/test-metadata.yaml
53+
value: tasks/test-metadata/0.3/test-metadata.yaml
7854
params:
7955
- name: SNAPSHOT
8056
value: $(params.SNAPSHOT)
8157
- name: test-name
8258
value: $(context.pipelineRun.name)
8359
- name: provision-kind-cluster
8460
runAfter:
85-
- sealights-refs
8661
- test-metadata
8762
taskRef:
8863
resolver: git
@@ -151,9 +126,9 @@ spec:
151126
- name: oci-credentials
152127
value: $(params.konflux-test-infra-secret)
153128
- name: component-image-repository
154-
value: $(tasks.sealights-refs.results.sealights-container-repo)
129+
value: $(tasks.test-metadata.results.container-repo)
155130
- name: component-image-tag
156-
value: $(tasks.sealights-refs.results.sealights-container-tag)
131+
value: $(tasks.test-metadata.results.container-tag)
157132
- name: build-credentials
158133
value: "konflux-e2e-secrets"
159134
- name: konflux-e2e-tests
@@ -183,15 +158,7 @@ spec:
183158
- name: job-spec
184159
value: $(tasks.test-metadata.results.job-spec)
185160
- name: component-image
186-
value: $(tasks.sealights-refs.results.sealights-container-image)
187-
- name: sealights-bsid
188-
value: $(tasks.sealights-refs.results.sealights-bsid)
189-
- name: test-stage
190-
value: $(params.test-stage)
191-
- name: enable-sealights
192-
value: $(params.enable-sealights)
193-
- name: enable-sl-plugin
194-
value: $(params.enable-sl-plugin)
161+
value: $(tasks.test-metadata.results.container-image)
195162
- name: cluster-access-secret-name
196163
value: kfg-$(context.pipelineRun.name)
197164
- name: test-environment

0 commit comments

Comments
 (0)