From 76d1bcc871f40fdf1ee35d5109c22298ccd889db Mon Sep 17 00:00:00 2001 From: Jeff Cantrill Date: Fri, 7 Aug 2026 15:10:14 -0400 Subject: [PATCH 1/2] chore(clo): remove e2e job in favor of one that runs using bundle --- ...shift-cluster-logging-operator-master.yaml | 42 -------- ...r-logging-operator-master-postsubmits.yaml | 1 - ...er-logging-operator-master-presubmits.yaml | 96 ------------------- 3 files changed, 139 deletions(-) diff --git a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml index ec47c1a9d223b..108115894eb76 100644 --- a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml @@ -32,9 +32,6 @@ images: items: - from: ubi9-minimal 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 @@ -92,43 +89,6 @@ tests: commands: ARTIFACTS_DIR=${ARTIFACT_DIR} make coverage container: from: src -- as: e2e-target - cluster_claim: - architecture: amd64 - cloud: aws - labels: - region: us-east-1 - owner: obs-logging - product: ocp - timeout: 1h0m0s - version: "4.21" - 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 - 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: e2e-using-bundle cluster_claim: architecture: amd64 @@ -186,8 +146,6 @@ tests: 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 diff --git a/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-postsubmits.yaml index 56c5bb934189d..26211de4987d9 100644 --- a/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-postsubmits.yaml @@ -9,7 +9,6 @@ postsubmits: decoration_config: sparse_checkout_files: - Dockerfile - - olm_deploy/operatorregistry/Dockerfile labels: ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen diff --git a/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-presubmits.yaml index 62bd661b37023..49976ddccb87a 100644 --- a/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-presubmits.yaml @@ -11,7 +11,6 @@ presubmits: decoration_config: sparse_checkout_files: - Dockerfile - - olm_deploy/operatorregistry/Dockerfile labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -57,96 +56,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )ci-index-cluster-logging-operator-bundle,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build02 - context: ci/prow/e2e-target - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - olm_deploy/operatorregistry/Dockerfile - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-logging-operator-master-e2e-target - rerun_command: /test e2e-target - skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE) - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-target - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/hive-hive-credentials - name: hive-hive-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/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: hive-hive-credentials - secret: - secretName: hive-hive-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-target,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -158,7 +67,6 @@ presubmits: decoration_config: sparse_checkout_files: - Dockerfile - - olm_deploy/operatorregistry/Dockerfile labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -249,7 +157,6 @@ presubmits: decoration_config: sparse_checkout_files: - Dockerfile - - olm_deploy/operatorregistry/Dockerfile labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -339,7 +246,6 @@ presubmits: decoration_config: sparse_checkout_files: - Dockerfile - - olm_deploy/operatorregistry/Dockerfile labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -397,7 +303,6 @@ presubmits: decoration_config: sparse_checkout_files: - Dockerfile - - olm_deploy/operatorregistry/Dockerfile labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -462,7 +367,6 @@ presubmits: decoration_config: sparse_checkout_files: - Dockerfile - - olm_deploy/operatorregistry/Dockerfile labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" From cd4361ff344bbe61a38671245ce3d6cfcd7eb7b7 Mon Sep 17 00:00:00 2001 From: Jeff Cantrill Date: Fri, 7 Aug 2026 15:26:12 -0400 Subject: [PATCH 2/2] chore(vector): update v0.54 for logging 6.6. Remove obs job --- .../ViaQ/vector/ViaQ-vector-v0.50.0-rh.yaml | 159 ----- .../ViaQ/vector/ViaQ-vector-v0.54.0-rh.yaml | 6 +- ...shift-cluster-logging-operator-master.yaml | 1 - .../ViaQ-vector-v0.50.0-rh-postsubmits.yaml | 64 -- .../ViaQ-vector-v0.50.0-rh-presubmits.yaml | 565 ------------------ ...er-logging-operator-master-presubmits.yaml | 1 - 6 files changed, 3 insertions(+), 793 deletions(-) delete mode 100644 ci-operator/config/ViaQ/vector/ViaQ-vector-v0.50.0-rh.yaml delete mode 100644 ci-operator/jobs/ViaQ/vector/ViaQ-vector-v0.50.0-rh-postsubmits.yaml delete mode 100644 ci-operator/jobs/ViaQ/vector/ViaQ-vector-v0.50.0-rh-presubmits.yaml diff --git a/ci-operator/config/ViaQ/vector/ViaQ-vector-v0.50.0-rh.yaml b/ci-operator/config/ViaQ/vector/ViaQ-vector-v0.50.0-rh.yaml deleted file mode 100644 index 08c40e3ccb7a4..0000000000000 --- a/ci-operator/config/ViaQ/vector/ViaQ-vector-v0.50.0-rh.yaml +++ /dev/null @@ -1,159 +0,0 @@ -base_images: - builder: - name: ubi - namespace: ocp - tag: "9" - cluster-logging-operator: - name: 6.y - namespace: logging - tag: cluster-logging-operator - cluster-logging-operator-e2e: - name: 6.y - namespace: logging - tag: cluster-logging-operator-e2e - cluster-logging-operator-registry: - name: 6.y - namespace: logging - tag: cluster-logging-operator-registry - log-file-metric-exporter: - name: 6.y - namespace: logging - tag: log-file-metric-exporter - logging-eventrouter: - name: 5.y - namespace: logging - tag: logging-eventrouter - oauth-proxy: - name: "4.14" - namespace: ocp - tag: oauth-proxy - ubi9-minimal: - name: ubi-minimal - namespace: ocp - tag: "9" -build_root: - image_stream_tag: - name: release - namespace: openshift - tag: rhel-9-release-golang-1.23-openshift-4.20 -images: - items: - - dockerfile_path: Dockerfile - from: ubi9-minimal - to: vector - - dockerfile_path: Dockerfile.unit - from: builder - to: logging-vector-test-unit -promotion: - to: - - namespace: logging - tag: v0.50.0 -releases: - latest: - release: - channel: stable - version: "4.18" -resources: - '*': - limits: - memory: 20Gi - requests: - cpu: 100m - memory: 200Mi -tests: -- as: unit - commands: make test - container: - from: logging-vector-test-unit -- as: cargo-deny-check-bans - commands: cargo deny --no-default-features --features ocp-logging check bans - container: - from: logging-vector-test-unit -- as: cargo-clippy-check - commands: cargo clippy --workspace --all-targets -- -D warnings - container: - from: logging-vector-test-unit - optional: true -- as: cargo-fmt-check - commands: cargo fmt --check - container: - from: logging-vector-test-unit - optional: true -- as: ldd-openssl - commands: ldd /usr/bin/vector | grep -E 'libcrypto|libssl' - container: - from: vector -- as: cluster-logging-operator-e2e - cluster_claim: - architecture: amd64 - cloud: aws - labels: - region: us-east-1 - owner: obs-logging - product: ocp - timeout: 1h30m0s - version: "4.18" - steps: - test: - - as: test - cli: latest - commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=${ARTIFACT_DIR}/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts - make test-e2e - 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_OAUTH_PROXY - name: pipeline:oauth-proxy - - env: IMAGE_LOGGING_VECTOR - name: pipeline: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 - timeout: 3h0m0s - workflow: generic-claim - timeout: 5h0m0s -- as: clo-functional - cluster_claim: - architecture: amd64 - cloud: aws - labels: - region: us-east-1 - owner: obs-logging - product: ocp - timeout: 1h30m0s - version: "4.18" - steps: - test: - - as: test - cli: latest - commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=${ARTIFACT_DIR}/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts - make test-functional - 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_OAUTH_PROXY - name: pipeline:oauth-proxy - - env: IMAGE_LOGGING_VECTOR - name: pipeline: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: v0.50.0-rh - org: ViaQ - repo: vector diff --git a/ci-operator/config/ViaQ/vector/ViaQ-vector-v0.54.0-rh.yaml b/ci-operator/config/ViaQ/vector/ViaQ-vector-v0.54.0-rh.yaml index 0d96c94e2a7f6..6a3f56098286b 100644 --- a/ci-operator/config/ViaQ/vector/ViaQ-vector-v0.54.0-rh.yaml +++ b/ci-operator/config/ViaQ/vector/ViaQ-vector-v0.54.0-rh.yaml @@ -4,15 +4,15 @@ base_images: namespace: ocp tag: "9" cluster-logging-operator: - name: 6.y + name: "6.6" namespace: logging tag: cluster-logging-operator cluster-logging-operator-e2e: - name: 6.y + name: "6.6" namespace: logging tag: cluster-logging-operator-e2e cluster-logging-operator-registry: - name: 6.y + name: "6.6" namespace: logging tag: cluster-logging-operator-registry log-file-metric-exporter: diff --git a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml index 108115894eb76..71b5b5ec5ae66 100644 --- a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml @@ -99,7 +99,6 @@ tests: product: ocp timeout: 1h0m0s version: "4.21" - optional: true skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE) steps: dependencies: diff --git a/ci-operator/jobs/ViaQ/vector/ViaQ-vector-v0.50.0-rh-postsubmits.yaml b/ci-operator/jobs/ViaQ/vector/ViaQ-vector-v0.50.0-rh-postsubmits.yaml deleted file mode 100644 index 7009e6c1a338f..0000000000000 --- a/ci-operator/jobs/ViaQ/vector/ViaQ-vector-v0.50.0-rh-postsubmits.yaml +++ /dev/null @@ -1,64 +0,0 @@ -postsubmits: - ViaQ/vector: - - agent: kubernetes - always_run: true - branches: - - ^v0\.50\.0-rh$ - cluster: build13 - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - Dockerfile.unit - labels: - ci-operator.openshift.io/is-promotion: "true" - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-ViaQ-vector-v0.50.0-rh-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] - 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 diff --git a/ci-operator/jobs/ViaQ/vector/ViaQ-vector-v0.50.0-rh-presubmits.yaml b/ci-operator/jobs/ViaQ/vector/ViaQ-vector-v0.50.0-rh-presubmits.yaml deleted file mode 100644 index 4efac89728875..0000000000000 --- a/ci-operator/jobs/ViaQ/vector/ViaQ-vector-v0.50.0-rh-presubmits.yaml +++ /dev/null @@ -1,565 +0,0 @@ -presubmits: - ViaQ/vector: - - agent: kubernetes - always_run: true - branches: - - ^v0\.50\.0-rh$ - - ^v0\.50\.0-rh- - cluster: build02 - context: ci/prow/cargo-clippy-check - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - Dockerfile.unit - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ViaQ-vector-v0.50.0-rh-cargo-clippy-check - optional: true - rerun_command: /test cargo-clippy-check - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=cargo-clippy-check - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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/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: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )cargo-clippy-check,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^v0\.50\.0-rh$ - - ^v0\.50\.0-rh- - cluster: build02 - context: ci/prow/cargo-deny-check-bans - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - Dockerfile.unit - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ViaQ-vector-v0.50.0-rh-cargo-deny-check-bans - rerun_command: /test cargo-deny-check-bans - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=cargo-deny-check-bans - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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/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: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )cargo-deny-check-bans,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^v0\.50\.0-rh$ - - ^v0\.50\.0-rh- - cluster: build02 - context: ci/prow/cargo-fmt-check - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - Dockerfile.unit - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ViaQ-vector-v0.50.0-rh-cargo-fmt-check - optional: true - rerun_command: /test cargo-fmt-check - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=cargo-fmt-check - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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/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: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )cargo-fmt-check,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^v0\.50\.0-rh$ - - ^v0\.50\.0-rh- - cluster: build02 - context: ci/prow/clo-functional - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - Dockerfile.unit - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ViaQ-vector-v0.50.0-rh-clo-functional - rerun_command: /test clo-functional - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=clo-functional - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/hive-hive-credentials - name: hive-hive-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/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: hive-hive-credentials - secret: - secretName: hive-hive-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )clo-functional,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^v0\.50\.0-rh$ - - ^v0\.50\.0-rh- - cluster: build02 - context: ci/prow/cluster-logging-operator-e2e - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - Dockerfile.unit - timeout: 5h0m0s - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ViaQ-vector-v0.50.0-rh-cluster-logging-operator-e2e - rerun_command: /test cluster-logging-operator-e2e - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=cluster-logging-operator-e2e - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/hive-hive-credentials - name: hive-hive-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/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: hive-hive-credentials - secret: - secretName: hive-hive-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )cluster-logging-operator-e2e,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^v0\.50\.0-rh$ - - ^v0\.50\.0-rh- - cluster: build02 - context: ci/prow/images - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - Dockerfile.unit - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ViaQ-vector-v0.50.0-rh-images - rerun_command: /test images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - 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/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: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^v0\.50\.0-rh$ - - ^v0\.50\.0-rh- - cluster: build02 - context: ci/prow/ldd-openssl - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - Dockerfile.unit - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ViaQ-vector-v0.50.0-rh-ldd-openssl - rerun_command: /test ldd-openssl - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=ldd-openssl - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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/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: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )ldd-openssl,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^v0\.50\.0-rh$ - - ^v0\.50\.0-rh- - cluster: build02 - context: ci/prow/unit - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - Dockerfile.unit - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ViaQ-vector-v0.50.0-rh-unit - rerun_command: /test unit - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=unit - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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/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: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )unit,?($|\s.*) diff --git a/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-presubmits.yaml index 49976ddccb87a..c6d86f2c2a455 100644 --- a/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-presubmits.yaml @@ -71,7 +71,6 @@ presubmits: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-logging-operator-master-e2e-using-bundle - optional: true rerun_command: /test e2e-using-bundle skip_if_only_changed: ^docs/|^config/docs|\.adoc$|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE) spec: