Skip to content

Commit 7582c67

Browse files
jcantrilljcantrill
authored
init logging 6.1 CI (openshift#58934)
1 parent c1b6de5 commit 7582c67

File tree

6 files changed

+760
-6
lines changed

6 files changed

+760
-6
lines changed

‎ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ operator:
9393
with: pipeline:log-file-metric-exporter
9494
promotion:
9595
to:
96-
- name: "6.1"
96+
- name: 6.y
9797
namespace: logging
9898
releases:
9999
latest:

‎ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-6.1.yaml‎

Lines changed: 230 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,230 @@
1+
base_images:
2+
base:
3+
name: release
4+
namespace: openshift
5+
tag: rhel-9-release-golang-1.22-openshift-4.17
6+
elasticsearch-operator-src:
7+
name: "5.8"
8+
namespace: logging
9+
tag: elasticsearch-operator-src
10+
log-file-metric-exporter:
11+
name: "6.1"
12+
namespace: logging
13+
tag: log-file-metric-exporter
14+
logging-eventrouter:
15+
name: "6.1"
16+
namespace: logging
17+
tag: logging-eventrouter
18+
logging-vector:
19+
name: "6.1"
20+
namespace: logging
21+
tag: vector
22+
loki-operator:
23+
name: 5.y
24+
namespace: logging
25+
tag: loki-operator
26+
loki-operator-src:
27+
name: 5.y
28+
namespace: logging
29+
tag: loki-operator-src
30+
ocp_builder_rhel-9-golang-1.22-openshift-4.17:
31+
name: builder
32+
namespace: ocp
33+
tag: rhel-9-golang-1.22-openshift-4.17
34+
ubi9-minimal:
35+
name: ubi-minimal
36+
namespace: ocp
37+
tag: "9"
38+
build_root:
39+
image_stream_tag:
40+
name: release
41+
namespace: openshift
42+
tag: rhel-9-release-golang-1.22-openshift-4.17
43+
images:
44+
- from: ubi9-minimal
45+
inputs:
46+
base:
47+
as:
48+
- registry.redhat.io/ubi9/go-toolset:latest
49+
ocp_builder_rhel-9-golang-1.22-openshift-4.17:
50+
as:
51+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
52+
to: cluster-logging-operator
53+
- dockerfile_path: olm_deploy/operatorregistry/Dockerfile
54+
from: base
55+
to: cluster-logging-operator-registry
56+
- dockerfile_literal: |
57+
FROM registry.ci.openshift.org/logging/5.8:elasticsearch-operator-src AS es-src
58+
FROM loki-operator-src AS lo-src
59+
FROM registry.redhat.io/ubi9/go-toolset:latest
60+
ADD . /go/src/github.com/openshift/cluster-logging-operator
61+
COPY --from=es-src /go/src/github.com/openshift/elasticsearch-operator /go/src/github.com/openshift/elasticsearch-operator
62+
COPY --from=lo-src /go/src/github.com/openshift/loki/operator /go/src/github.com/openshift/loki/operator
63+
WORKDIR /go/src/github.com/openshift/cluster-logging-operator
64+
USER 0
65+
RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \
66+
&& chmod 755 kubectl && mv kubectl /go/bin
67+
RUN mkdir -p /go/src/github.com/openshift/cluster-logging-operator/bin/
68+
RUN go mod download
69+
RUN make tools
70+
RUN chmod -R 777 /go
71+
RUN make bin/functional-benchmarker
72+
inputs:
73+
base:
74+
as:
75+
- registry.redhat.io/ubi9/go-toolset:latest
76+
elasticsearch-operator-src:
77+
as:
78+
- registry.ci.openshift.org/logging/5.8:elasticsearch-operator-src
79+
loki-operator-src:
80+
as:
81+
- loki-operator-src
82+
to: cluster-logging-operator-e2e
83+
operator:
84+
bundles:
85+
- as: cluster-logging-operator-bundle
86+
dockerfile_path: bundle.Dockerfile
87+
substitutions:
88+
- pullspec: quay.io/openshift-logging/cluster-logging-operator:latest
89+
with: pipeline:cluster-logging-operator
90+
- pullspec: quay.io/openshift-logging/vector:latest
91+
with: pipeline:logging-vector
92+
- pullspec: quay.io/openshift-logging/log-file-metric-exporter:latest
93+
with: pipeline:log-file-metric-exporter
94+
promotion:
95+
to:
96+
- name: "6.1"
97+
namespace: logging
98+
releases:
99+
latest:
100+
candidate:
101+
product: ocp
102+
stream: ci
103+
version: "4.17"
104+
resources:
105+
'*':
106+
requests:
107+
cpu: 200m
108+
memory: 200Mi
109+
tests:
110+
- as: lint
111+
commands: make lint
112+
container:
113+
from: src
114+
- as: unit
115+
commands: ARTIFACTS_DIR=${ARTIFACT_DIR} make coverage
116+
container:
117+
from: src
118+
timeout: 15m0s
119+
- as: e2e-target
120+
cluster_claim:
121+
architecture: amd64
122+
cloud: aws
123+
labels:
124+
region: us-east-1
125+
owner: obs-logging
126+
product: ocp
127+
timeout: 1h0m0s
128+
version: "4.17"
129+
skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)
130+
steps:
131+
test:
132+
- as: test
133+
cli: latest
134+
commands: export GOFLAGS=-mod=mod ; export PATH=/go/bin:$PATH ; pushd /go/src/github.com/openshift/loki/operator
135+
&& make deploy IMG=${IMAGE_LOKI_OPERATOR} && popd && FAKE_HOME_DIR=/tmp/home
136+
LOG_DIR=${ARTIFACT_DIR}/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts
137+
make test-e2e
138+
dependencies:
139+
- env: IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY
140+
name: pipeline:cluster-logging-operator-registry
141+
- env: IMAGE_CLUSTER_LOGGING_OPERATOR
142+
name: pipeline:cluster-logging-operator
143+
- env: IMAGE_LOGGING_VECTOR
144+
name: pipeline:logging-vector
145+
- env: IMAGE_LOGGING_EVENTROUTER
146+
name: pipeline:logging-eventrouter
147+
- env: IMAGE_LOG_FILE_METRIC_EXPORTER
148+
name: pipeline:log-file-metric-exporter
149+
- env: IMAGE_LOKI_OPERATOR
150+
name: pipeline:loki-operator
151+
from: pipeline:cluster-logging-operator-e2e
152+
resources:
153+
requests:
154+
cpu: 100m
155+
timeout: 3h0m0s
156+
workflow: generic-claim
157+
timeout: 5h0m0s
158+
- as: functional-target
159+
cluster_claim:
160+
architecture: amd64
161+
cloud: aws
162+
labels:
163+
region: us-east-1
164+
owner: obs-logging
165+
product: ocp
166+
timeout: 1h0m0s
167+
version: "4.17"
168+
skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)
169+
steps:
170+
test:
171+
- as: test
172+
cli: latest
173+
commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=${ARTIFACT_DIR}/logging-logs make
174+
test-functional ARTIFACT_DIR=${ARTIFACT_DIR}
175+
dependencies:
176+
- env: IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY
177+
name: pipeline:cluster-logging-operator-registry
178+
- env: IMAGE_CLUSTER_LOGGING_OPERATOR
179+
name: pipeline:cluster-logging-operator
180+
- env: IMAGE_LOGGING_VECTOR
181+
name: pipeline:logging-vector
182+
- env: IMAGE_LOGGING_EVENTROUTER
183+
name: pipeline:logging-eventrouter
184+
- env: IMAGE_LOG_FILE_METRIC_EXPORTER
185+
name: pipeline:log-file-metric-exporter
186+
from: pipeline:cluster-logging-operator-e2e
187+
resources:
188+
requests:
189+
cpu: 100m
190+
workflow: generic-claim
191+
- as: upgrade
192+
cluster_claim:
193+
architecture: amd64
194+
cloud: aws
195+
labels:
196+
region: us-east-1
197+
owner: obs-logging
198+
product: ocp
199+
timeout: 1h0m0s
200+
version: "4.17"
201+
optional: true
202+
skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)
203+
steps:
204+
test:
205+
- as: test
206+
cli: latest
207+
commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=${ARTIFACT_DIR}/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts
208+
make test-upgrade
209+
dependencies:
210+
- env: IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY
211+
name: pipeline:cluster-logging-operator-registry
212+
- env: IMAGE_CLUSTER_LOGGING_OPERATOR
213+
name: pipeline:cluster-logging-operator
214+
- env: IMAGE_LOGGING_VECTOR
215+
name: pipeline:logging-vector
216+
- env: IMAGE_LOGGING_EVENTROUTER
217+
name: pipeline:logging-eventrouter
218+
- env: IMAGE_LOG_FILE_METRIC_EXPORTER
219+
name: pipeline:log-file-metric-exporter
220+
from: pipeline:cluster-logging-operator-e2e
221+
resources:
222+
requests:
223+
cpu: 100m
224+
timeout: 3h0m0s
225+
workflow: generic-claim
226+
timeout: 5h0m0s
227+
zz_generated_metadata:
228+
branch: release-6.1
229+
org: openshift
230+
repo: cluster-logging-operator

‎ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-6.1-postsubmits.yaml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
postsubmits:
2+
openshift/cluster-logging-operator:
3+
- agent: kubernetes
4+
always_run: true
5+
branches:
6+
- ^release-6\.1$
7+
cluster: build03
8+
decorate: true
9+
decoration_config:
10+
skip_cloning: true
11+
labels:
12+
ci-operator.openshift.io/is-promotion: "true"
13+
ci.openshift.io/generator: prowgen
14+
job-release: "4.17"
15+
max_concurrency: 1
16+
name: branch-ci-openshift-cluster-logging-operator-release-6.1-images
17+
spec:
18+
containers:
19+
- args:
20+
- --gcs-upload-secret=/secrets/gcs/service-account.json
21+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
22+
- --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
23+
- --promote
24+
- --report-credentials-file=/etc/report/credentials
25+
- --target=[images]
26+
command:
27+
- ci-operator
28+
image: ci-operator:latest
29+
imagePullPolicy: Always
30+
name: ""
31+
resources:
32+
requests:
33+
cpu: 10m
34+
volumeMounts:
35+
- mountPath: /secrets/gcs
36+
name: gcs-credentials
37+
readOnly: true
38+
- mountPath: /secrets/manifest-tool
39+
name: manifest-tool-local-pusher
40+
readOnly: true
41+
- mountPath: /etc/pull-secret
42+
name: pull-secret
43+
readOnly: true
44+
- mountPath: /etc/push-secret
45+
name: push-secret
46+
readOnly: true
47+
- mountPath: /etc/report
48+
name: result-aggregator
49+
readOnly: true
50+
serviceAccountName: ci-operator
51+
volumes:
52+
- name: manifest-tool-local-pusher
53+
secret:
54+
secretName: manifest-tool-local-pusher
55+
- name: pull-secret
56+
secret:
57+
secretName: registry-pull-credentials
58+
- name: push-secret
59+
secret:
60+
secretName: registry-push-credentials-ci-central
61+
- name: result-aggregator
62+
secret:
63+
secretName: result-aggregator

0 commit comments

Comments
 (0)