Skip to content

Commit 6444619

Browse files
committed
Delete old pipeline resources
1 parent 2ac70ce commit 6444619

5 files changed

+91
-291
lines changed

src/kustomization.yaml

-12
This file was deleted.

src/pipeline-embedded.yaml

-134
This file was deleted.

src/pipeline.yaml

+91-20
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: tekton.dev/v1beta1
22
kind: Pipeline
33
metadata:
44
name: testsuite-pipeline
5+
labels:
6+
deployment: kuadrant-qe-pipeline
57
spec:
68
params:
79
- default: 'quay.io/kuadrant/testsuite:unstable'
@@ -26,7 +28,7 @@ spec:
2628
name: rp-project
2729
type: string
2830
tasks:
29-
- name: run-tests
31+
- name: run-tests-upload-results
3032
params:
3133
- name: testsuite-image
3234
value: $(params.testsuite-image)
@@ -38,28 +40,97 @@ spec:
3840
value: $(params.make-target)
3941
- name: settings-cm
4042
value: $(params.settings-cm)
41-
taskRef:
42-
kind: Task
43-
name: run-tests
44-
workspaces:
45-
- name: shared-workspace
46-
- name: upload-test-results
47-
params:
48-
- name: pipelinerun-id
49-
value: $(context.pipelineRun.uid)
50-
- name: testsuite-image
51-
value: $(params.testsuite-image)
52-
- name: make-target
53-
value: $(params.make-target)
5443
- name: rp-project
5544
value: $(params.rp-project)
56-
runAfter:
57-
- run-tests
58-
taskRef:
59-
kind: Task
60-
name: upload-test-results
45+
taskSpec:
46+
params:
47+
- name: testsuite-image
48+
- name: kube-api
49+
- name: project
50+
- name: make-target
51+
- name: settings-cm
52+
- name: rp-project
53+
steps:
54+
- args:
55+
- >-
56+
cp /var/kuadrant-settings/settings.local.yaml
57+
/opt/workdir/kuadrant-testsuite/config && oc login $(params.kube-api)
58+
--username $(KUBE_USER) --password $(KUBE_PASSWORD)
59+
--insecure-skip-tls-verify && (make $(params.make-target) || true)
60+
command:
61+
- /bin/bash
62+
- '-cx'
63+
resources:
64+
limits:
65+
cpu: '1'
66+
memory: 1000Mi
67+
env:
68+
- name: WORKSPACE
69+
value: $(workspaces.shared-workspace.path)
70+
- name: KUADRANT_cluster__project
71+
value: $(params.project)
72+
- name: KUADRANT_control_plane__hub__project
73+
value: $(params.project)
74+
- name: KUBE_USER
75+
valueFrom:
76+
secretKeyRef:
77+
key: KUBE_USER
78+
name: openshift-pipelines-credentials
79+
- name: KUBE_PASSWORD
80+
valueFrom:
81+
secretKeyRef:
82+
key: KUBE_PASSWORD
83+
name: openshift-pipelines-credentials
84+
image: $(params.testsuite-image)
85+
imagePullPolicy: Always
86+
name: run-tests
87+
volumeMounts:
88+
- mountPath: /var/kuadrant-settings
89+
name: $(params.settings-cm)
90+
- args:
91+
- make reportportal
92+
command:
93+
- /bin/bash
94+
- '-cx'
95+
resources:
96+
limits:
97+
cpu: '1'
98+
memory: 1000Mi
99+
env:
100+
- name: WORKSPACE
101+
value: $(workspaces.shared-workspace.path)
102+
- name: RP_LAUNCH_NAME
103+
value: pipeline-$(params.make-target)-$(context.pipelineRun.uid)
104+
- name: RP_PROJECT
105+
value: $(params.rp-project)
106+
- name: REPORTPORTAL
107+
valueFrom:
108+
secretKeyRef:
109+
key: RP_URL
110+
name: rp-credentials
111+
- name: RP_TOKEN
112+
valueFrom:
113+
secretKeyRef:
114+
key: RP_TOKEN
115+
name: rp-credentials
116+
- name: REQUESTS_CA_BUNDLE
117+
value: /var/ca-bundle/tls-ca-bundle.pem
118+
image: $(params.testsuite-image)
119+
imagePullPolicy: Always
120+
name: upload-test-results
121+
volumeMounts:
122+
- mountPath: /var/ca-bundle
123+
name: rp-ca-bundle
124+
volumes:
125+
- configMap:
126+
name: $(params.settings-cm)
127+
name: $(params.settings-cm)
128+
- configMap:
129+
name: rp-ca-bundle
130+
name: rp-ca-bundle
131+
workspaces:
132+
- name: shared-workspace
61133
workspaces:
62134
- name: shared-workspace
63135
workspaces:
64136
- name: shared-workspace
65-

src/run-tests-task.yaml

-65
This file was deleted.

0 commit comments

Comments
 (0)