Repository navigation
openshift-logging: Add build for CLO 6.7 branch #87740
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
openshift-merge-bot
merged 1 commit into
openshift:main
from
jcantrill:clo-6.7-release-job
Oct 28, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
164 changes: 164 additions & 0 deletions
164
...ig/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-6.7.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| base_images: | ||
| log-file-metric-exporter: | ||
| name: 6.y | ||
| namespace: logging | ||
| tag: log-file-metric-exporter | ||
| logging-eventrouter: | ||
| name: 6.y | ||
| namespace: logging | ||
| tag: logging-eventrouter | ||
| logging-vector: | ||
| name: vector | ||
| namespace: logging | ||
| tag: v0.54.0 | ||
| loki-operator: | ||
| name: 5.y | ||
| namespace: logging | ||
| tag: loki-operator | ||
| loki-operator-src: | ||
| name: 5.y | ||
| namespace: logging | ||
| tag: loki-operator-src | ||
| ubi9-minimal: | ||
| name: ubi-minimal | ||
| namespace: ocp | ||
| tag: "9" | ||
| build_root: | ||
| image_stream_tag: | ||
| name: builder | ||
| namespace: ocp | ||
| tag: rhel-9-golang-1.26-openshift-4.23 | ||
| images: | ||
| items: | ||
| - dockerfile_path: Dockerfile | ||
| to: cluster-logging-operator | ||
| - dockerfile_path: olm_deploy/operatorregistry/Dockerfile | ||
| from: ubi9-minimal | ||
| to: cluster-logging-operator-registry | ||
| - dockerfile_literal: | | ||
| FROM src | ||
| COPY --from=loki-operator-src /go/src/github.com/openshift/loki/operator /go/src/github.com/openshift/loki/operator | ||
| RUN dnf install gettext -y | ||
| RUN curl -LO "https://dl.k8s.io/release/v1.35.0/bin/linux/amd64/kubectl" \ | ||
| && chmod 755 kubectl && mv kubectl /go/bin | ||
| RUN mkdir -p /go/src/github.com/openshift/cluster-logging-operator/bin/ | ||
| RUN go mod download | ||
| RUN make tools | ||
| RUN chmod -R 777 /go | ||
| RUN make bin/functional-benchmarker | ||
| from: src | ||
| inputs: | ||
| loki-operator-src: | ||
| as: | ||
| - loki-operator-src | ||
| to: cluster-logging-operator-e2e | ||
| operator: | ||
| bundles: | ||
| - as: cluster-logging-operator-bundle | ||
| dockerfile_path: bundle.Dockerfile | ||
| substitutions: | ||
| - pullspec: quay.io/openshift-logging/cluster-logging-operator.* | ||
| with: pipeline:cluster-logging-operator | ||
| - pullspec: quay.io/openshift-logging/vector.* | ||
| with: pipeline:logging-vector | ||
| - pullspec: quay.io/openshift-logging/log-file-metric-exporter.* | ||
| with: pipeline:log-file-metric-exporter | ||
| promotion: | ||
| to: | ||
| - additional_images: | ||
| cluster-logging-operator-bundle: cluster-logging-operator-bundle | ||
| name: "6.7" | ||
| namespace: logging | ||
| releases: | ||
| latest: | ||
| release: | ||
| channel: stable | ||
| version: "4.22" | ||
| resources: | ||
| '*': | ||
| requests: | ||
| cpu: 200m | ||
| memory: 200Mi | ||
| tests: | ||
| - as: lint | ||
| commands: make lint | ||
| container: | ||
| from: src | ||
| - as: unit | ||
| commands: ARTIFACTS_DIR=${ARTIFACT_DIR} make coverage | ||
| container: | ||
| from: src | ||
| - as: e2e-target | ||
| cluster_claim: | ||
| architecture: amd64 | ||
| cloud: aws | ||
| labels: | ||
| region: us-east-2 | ||
| owner: obs-logging | ||
| product: ocp | ||
| timeout: 1h0m0s | ||
| version: "4.22" | ||
| skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE) | ||
| steps: | ||
| test: | ||
| - as: test | ||
| cli: latest | ||
| commands: export GOFLAGS=-mod=mod ; export PATH=/go/bin:$PATH ; FAKE_HOME_DIR=/tmp/home | ||
| LOG_DIR=${ARTIFACT_DIR}/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts | ||
| LOKI_OPERATOR_CHANNEL=stable-6.6 make test-e2e IMAGE_TLS_SCANNER=quay-proxy.ci.openshift.org/openshift/ci:tls-scanner_tls-scanner_tls-scanner-tool | ||
| dependencies: | ||
| - env: IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY | ||
| name: pipeline:cluster-logging-operator-registry | ||
| - env: IMAGE_CLUSTER_LOGGING_OPERATOR | ||
| name: pipeline:cluster-logging-operator | ||
| - env: IMAGE_LOGGING_VECTOR | ||
| name: pipeline:logging-vector | ||
| - env: IMAGE_LOGGING_EVENTROUTER | ||
| name: pipeline:logging-eventrouter | ||
| - env: IMAGE_LOG_FILE_METRIC_EXPORTER | ||
| name: pipeline:log-file-metric-exporter | ||
| - env: IMAGE_LOKI_OPERATOR | ||
| name: pipeline:loki-operator | ||
| from: pipeline:cluster-logging-operator-e2e | ||
| resources: | ||
| requests: | ||
| cpu: 100m | ||
| timeout: 3h0m0s | ||
| workflow: generic-claim | ||
| - as: functional-target | ||
| cluster_claim: | ||
| architecture: amd64 | ||
| cloud: aws | ||
| labels: | ||
| region: us-east-2 | ||
| owner: obs-logging | ||
| product: ocp | ||
| timeout: 1h0m0s | ||
| version: "4.22" | ||
| skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE) | ||
| steps: | ||
| test: | ||
| - as: test | ||
| cli: latest | ||
| commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=${ARTIFACT_DIR}/logging-logs make | ||
| test-functional ARTIFACT_DIR=${ARTIFACT_DIR} | ||
| dependencies: | ||
| - env: IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY | ||
| name: pipeline:cluster-logging-operator-registry | ||
| - env: IMAGE_CLUSTER_LOGGING_OPERATOR | ||
| name: pipeline:cluster-logging-operator | ||
| - env: IMAGE_LOGGING_VECTOR | ||
| name: pipeline:logging-vector | ||
| - env: IMAGE_LOGGING_EVENTROUTER | ||
| name: pipeline:logging-eventrouter | ||
| - env: IMAGE_LOG_FILE_METRIC_EXPORTER | ||
| name: pipeline:log-file-metric-exporter | ||
| from: pipeline:cluster-logging-operator-e2e | ||
| resources: | ||
| requests: | ||
| cpu: 100m | ||
| workflow: generic-claim | ||
| zz_generated_metadata: | ||
| branch: release-6.7 | ||
| org: openshift | ||
| repo: cluster-logging-operator | ||
65 changes: 65 additions & 0 deletions
65
.../cluster-logging-operator/openshift-cluster-logging-operator-release-6.7-postsubmits.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| postsubmits: | ||
| openshift/cluster-logging-operator: | ||
| - agent: kubernetes | ||
| always_run: true | ||
| branches: | ||
| - ^release-6\.7$ | ||
| cluster: build01 | ||
| decorate: true | ||
| decoration_config: | ||
| sparse_checkout_files: | ||
| - Dockerfile | ||
| - olm_deploy/operatorregistry/Dockerfile | ||
| labels: | ||
| ci-operator.openshift.io/is-promotion: "true" | ||
| ci.openshift.io/generator: prowgen | ||
| max_concurrency: 1 | ||
| name: branch-ci-openshift-cluster-logging-operator-release-6.7-images | ||
| spec: | ||
| containers: | ||
| - args: | ||
| - --gcs-upload-secret=/secrets/gcs/service-account.json | ||
| - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson | ||
| - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson | ||
| - --promote | ||
| - --report-credentials-file=/etc/report/credentials | ||
| - --target=[images] | ||
| - --target=cluster-logging-operator-bundle | ||
| command: | ||
| - ci-operator | ||
| image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest | ||
| imagePullPolicy: Always | ||
| name: "" | ||
| resources: | ||
| requests: | ||
| cpu: 10m | ||
| volumeMounts: | ||
| - mountPath: /secrets/gcs | ||
| name: gcs-credentials | ||
| readOnly: true | ||
| - mountPath: /secrets/manifest-tool | ||
| name: manifest-tool-local-pusher | ||
| readOnly: true | ||
| - mountPath: /etc/pull-secret | ||
| name: pull-secret | ||
| readOnly: true | ||
| - mountPath: /etc/push-secret | ||
| name: push-secret | ||
| readOnly: true | ||
| - mountPath: /etc/report | ||
| name: result-aggregator | ||
| readOnly: true | ||
| serviceAccountName: ci-operator | ||
| volumes: | ||
| - name: manifest-tool-local-pusher | ||
| secret: | ||
| secretName: manifest-tool-local-pusher | ||
| - name: pull-secret | ||
| secret: | ||
| secretName: registry-pull-credentials | ||
| - name: push-secret | ||
| secret: | ||
| secretName: registry-push-credentials-ci-central | ||
| - name: result-aggregator | ||
| secret: | ||
| secretName: result-aggregator |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not 6.7 for loki?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
stable-6.7 doesn't exist until the actual release of 6.7 and will not exist for ocp. My intention would be to change this once that happens but also, I have tested against 'community' and all the tests pass. This will be the plan forward for 'master' where we need to test against future releases of ocp where they may not have the stable channel of loki