diff --git a/ci-operator/config/redhat-openshift-ecosystem/certified-operators-preprod/redhat-openshift-ecosystem-certified-operators-preprod-ocp-4.22.yaml b/ci-operator/config/redhat-openshift-ecosystem/certified-operators-preprod/redhat-openshift-ecosystem-certified-operators-preprod-ocp-4.22.yaml index d1bbd43083ed9..a2b7cd998a1f9 100644 --- a/ci-operator/config/redhat-openshift-ecosystem/certified-operators-preprod/redhat-openshift-ecosystem-certified-operators-preprod-ocp-4.22.yaml +++ b/ci-operator/config/redhat-openshift-ecosystem/certified-operators-preprod/redhat-openshift-ecosystem-certified-operators-preprod-ocp-4.22.yaml @@ -1,8 +1,7 @@ releases: latest: - candidate: - product: ocp - stream: nightly + release: + channel: fast version: "4.22" resources: '*': diff --git a/ci-operator/config/redhat-openshift-ecosystem/certified-operators-prod/redhat-openshift-ecosystem-certified-operators-prod-ocp-4.22.yaml b/ci-operator/config/redhat-openshift-ecosystem/certified-operators-prod/redhat-openshift-ecosystem-certified-operators-prod-ocp-4.22.yaml index 962c1d7c57814..4c87b4ff807ef 100644 --- a/ci-operator/config/redhat-openshift-ecosystem/certified-operators-prod/redhat-openshift-ecosystem-certified-operators-prod-ocp-4.22.yaml +++ b/ci-operator/config/redhat-openshift-ecosystem/certified-operators-prod/redhat-openshift-ecosystem-certified-operators-prod-ocp-4.22.yaml @@ -1,8 +1,7 @@ releases: latest: - candidate: - product: ocp - stream: nightly + release: + channel: fast version: "4.22" resources: '*': diff --git a/ci-operator/config/redhat-openshift-ecosystem/openshift-preflight/redhat-openshift-ecosystem-openshift-preflight-main__4.21.yaml b/ci-operator/config/redhat-openshift-ecosystem/openshift-preflight/redhat-openshift-ecosystem-openshift-preflight-main__4.21.yaml deleted file mode 100644 index a4def64b81822..0000000000000 --- a/ci-operator/config/redhat-openshift-ecosystem/openshift-preflight/redhat-openshift-ecosystem-openshift-preflight-main__4.21.yaml +++ /dev/null @@ -1,97 +0,0 @@ -binary_build_commands: | - unset GOFLAGS - make build -build_root: - image_stream_tag: - name: release - namespace: openshift - tag: rhel-9-release-golang-1.26-openshift-4.23 -images: - items: - - dockerfile_literal: | - FROM registry.access.redhat.com/ubi9/ubi:latest - - RUN cat /etc/os-release - ARG OPERATOR_SDK_VERSION=1.40.0 - ARG ARCH=amd64 - - ADD openshift-preflight /src - ADD preflight /src/preflight - - RUN dnf install -y make \ - jq \ - bzip2 \ - gzip \ - iptables \ - findutils \ - git \ - && dnf clean all - - RUN curl -Lo /usr/local/bin/operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v${OPERATOR_SDK_VERSION}/operator-sdk_linux_${ARCH} \ - && chmod 755 /usr/local/bin/operator-sdk - inputs: - bin: - paths: - - destination_dir: . - source_path: /go/src/github.com/redhat-openshift-ecosystem/openshift-preflight/preflight - - destination_dir: . - source_path: /go/src/github.com/redhat-openshift-ecosystem/openshift-preflight - to: preflight-bin -releases: - latest: - release: - channel: fast - version: "4.21" -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tests: -- as: e2e - cluster_claim: - architecture: amd64 - cloud: aws - owner: rh-openshift-ecosystem - product: ocp - timeout: 1h0m0s - version: "4.21" - steps: - env: - CHANGE_CHANNEL_BASE: candidate - CINCINNATI_URL: https://api.integration.openshift.com/api/upgrades_info/graph - post: - - ref: gather-must-gather - pre: - - ref: ipi-install-rbac - - ref: openshift-configure-cincinnati - - ref: operator-pipelines-preflight-prod-approve-csrs - - ref: operator-pipelines-preflight-prod-operator-registry-cache-fix - test: - - as: e2e - commands: | - unset GOFLAGS - cd src - PREFLIGHT_E2E_ARTIFACTS=$(mktemp --directory) - echo "placeholder" >> ${PREFLIGHT_E2E_ARTIFACTS}/placeholder - echo "== pull request sha under test ==" - echo ${PULL_PULL_SHA} | tee ${ARTIFACT_DIR}/pull-request-sha.txt - echo "== preflight version - this includes the merge pr for this commit ==" - ./preflight --version | tee ${ARTIFACT_DIR}/preflight-version.txt - echo "== operator-sdk version ==" - operator-sdk version | tee ${ARTIFACT_DIR}/operator-sdk-version.txt - git log --oneline | head > ${ARTIFACT_DIR}/git-log-last-ten.txt - git rev-parse HEAD > ${ARTIFACT_DIR}/git-rev-parse-head.txt - make test-e2e ARTIFACTS_DIR=${PREFLIGHT_E2E_ARTIFACTS} - mv --verbose "${PREFLIGHT_E2E_ARTIFACTS}"/* ${ARTIFACT_DIR}/ - from: preflight-bin - resources: - requests: - cpu: 100m -zz_generated_metadata: - branch: main - org: redhat-openshift-ecosystem - repo: openshift-preflight - variant: "4.21" diff --git a/ci-operator/config/redhat-openshift-ecosystem/openshift-preflight/redhat-openshift-ecosystem-openshift-preflight-main__4.22.yaml b/ci-operator/config/redhat-openshift-ecosystem/openshift-preflight/redhat-openshift-ecosystem-openshift-preflight-main__4.22.yaml index 3ef0183343611..8c82cc6e6fa14 100644 --- a/ci-operator/config/redhat-openshift-ecosystem/openshift-preflight/redhat-openshift-ecosystem-openshift-preflight-main__4.22.yaml +++ b/ci-operator/config/redhat-openshift-ecosystem/openshift-preflight/redhat-openshift-ecosystem-openshift-preflight-main__4.22.yaml @@ -39,9 +39,8 @@ images: to: preflight-bin releases: latest: - candidate: - product: ocp - stream: nightly + release: + channel: fast version: "4.22" resources: '*': diff --git a/ci-operator/jobs/redhat-openshift-ecosystem/certified-operators-preprod/redhat-openshift-ecosystem-certified-operators-preprod-ocp-4.22-periodics.yaml b/ci-operator/jobs/redhat-openshift-ecosystem/certified-operators-preprod/redhat-openshift-ecosystem-certified-operators-preprod-ocp-4.22-periodics.yaml index 3b9bcb8ee3613..f4f40aa09555c 100644 --- a/ci-operator/jobs/redhat-openshift-ecosystem/certified-operators-preprod/redhat-openshift-ecosystem-certified-operators-preprod-ocp-4.22-periodics.yaml +++ b/ci-operator/jobs/redhat-openshift-ecosystem/certified-operators-preprod/redhat-openshift-ecosystem-certified-operators-preprod-ocp-4.22-periodics.yaml @@ -11,7 +11,6 @@ periodics: repo: certified-operators-preprod labels: ci.openshift.io/generator: prowgen - job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-redhat-openshift-ecosystem-certified-operators-preprod-ocp-4.22-preflight-preprod-claim spec: diff --git a/ci-operator/jobs/redhat-openshift-ecosystem/certified-operators-prod/redhat-openshift-ecosystem-certified-operators-prod-ocp-4.22-periodics.yaml b/ci-operator/jobs/redhat-openshift-ecosystem/certified-operators-prod/redhat-openshift-ecosystem-certified-operators-prod-ocp-4.22-periodics.yaml index 5abc8e5e66600..60eeb7731a610 100644 --- a/ci-operator/jobs/redhat-openshift-ecosystem/certified-operators-prod/redhat-openshift-ecosystem-certified-operators-prod-ocp-4.22-periodics.yaml +++ b/ci-operator/jobs/redhat-openshift-ecosystem/certified-operators-prod/redhat-openshift-ecosystem-certified-operators-prod-ocp-4.22-periodics.yaml @@ -11,7 +11,6 @@ periodics: repo: certified-operators-prod labels: ci.openshift.io/generator: prowgen - job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-redhat-openshift-ecosystem-certified-operators-prod-ocp-4.22-preflight-prod-claim spec: diff --git a/ci-operator/jobs/redhat-openshift-ecosystem/openshift-preflight/redhat-openshift-ecosystem-openshift-preflight-main-presubmits.yaml b/ci-operator/jobs/redhat-openshift-ecosystem/openshift-preflight/redhat-openshift-ecosystem-openshift-preflight-main-presubmits.yaml index 41d7d5a4fe15e..1bae5574a83b0 100644 --- a/ci-operator/jobs/redhat-openshift-ecosystem/openshift-preflight/redhat-openshift-ecosystem-openshift-preflight-main-presubmits.yaml +++ b/ci-operator/jobs/redhat-openshift-ecosystem/openshift-preflight/redhat-openshift-ecosystem-openshift-preflight-main-presubmits.yaml @@ -146,152 +146,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )4.13-images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build03 - context: ci/prow/4.21-e2e - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/variant: "4.21" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-redhat-openshift-ecosystem-openshift-preflight-main-4.21-e2e - rerun_command: /test 4.21-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=e2e - - --variant=4.21 - 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( | .* )4.21-e2e,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build03 - context: ci/prow/4.21-images - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/variant: "4.21" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-redhat-openshift-ecosystem-openshift-preflight-main-4.21-images - rerun_command: /test 4.21-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] - - --variant=4.21 - 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( | .* )4.21-images,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -305,7 +159,6 @@ presubmits: labels: ci-operator.openshift.io/variant: "4.22" ci.openshift.io/generator: prowgen - job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-redhat-openshift-ecosystem-openshift-preflight-main-4.22-e2e rerun_command: /test 4.22-e2e @@ -395,7 +248,6 @@ presubmits: labels: ci-operator.openshift.io/variant: "4.22" ci.openshift.io/generator: prowgen - job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-redhat-openshift-ecosystem-openshift-preflight-main-4.22-images rerun_command: /test 4.22-images