diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml deleted file mode 100644 index 47d0fb931aa12..0000000000000 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml +++ /dev/null @@ -1,95 +0,0 @@ -build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-8-golang-1.19-openshift-4.12 -images: - items: - - dockerfile_path: Dockerfile - to: oadp-operator-1.0 - - dockerfile_path: build/ci-Dockerfile - to: test-oadp-operator-1.0 -operator: - bundles: - - dockerfile_path: build/Dockerfile.bundle - substitutions: - - pullspec: quay.io/konveyor/oadp-operator:oadp-1.0 - with: oadp-operator-1.0 -releases: - latest: - release: - channel: fast - version: "4.12" -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 1000m - memory: 512Mi -tests: -- always_run: false - as: e2e-test-aws - run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ - steps: - cluster_profile: openshift-org-aws - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.0 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.0 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-aws -- as: e2e-test-aws-periodic - cron: 13 19 14,28 * * - reporter_config: - channel: '#oadp-cicd' - job_states_to_report: - - failure - - error - report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} - :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> :alert-siren: {{end}}' - steps: - cluster_profile: openshift-org-aws - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.0 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.0 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-aws -zz_generated_metadata: - branch: oadp-1.0 - org: openshift - repo: oadp-operator - variant: "4.12" diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml deleted file mode 100644 index dd13bba3de2fa..0000000000000 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml +++ /dev/null @@ -1,95 +0,0 @@ -build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-8-golang-1.20-openshift-4.14 -images: - items: - - dockerfile_path: Dockerfile - to: oadp-operator-1.0 - - dockerfile_path: build/ci-Dockerfile - to: test-oadp-operator-1.0 -operator: - bundles: - - dockerfile_path: build/Dockerfile.bundle - substitutions: - - pullspec: quay.io/konveyor/oadp-operator:oadp-1.0 - with: oadp-operator-1.0 -releases: - latest: - release: - channel: fast - version: "4.14" -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 1000m - memory: 512Mi -tests: -- always_run: false - as: e2e-test-aws - run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ - steps: - cluster_profile: openshift-org-aws - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.0 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.0 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-aws -- as: e2e-test-aws-periodic - cron: 13 19 14,28 * * - reporter_config: - channel: '#oadp-cicd' - job_states_to_report: - - failure - - error - report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} - :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> :alert-siren: {{end}}' - steps: - cluster_profile: openshift-org-aws - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.0 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.0 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-aws -zz_generated_metadata: - branch: oadp-1.0 - org: openshift - repo: oadp-operator - variant: "4.14" diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml index 2994c691f9077..56347de012bd7 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml @@ -5,13 +5,34 @@ build_root: tag: rhel-8-golang-1.19-openshift-4.12 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator-1.3 - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator-1.3 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.3 with: oadp-operator-1.3 @@ -34,7 +55,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable-1.3 OO_INSTALL_NAMESPACE: openshift-adp @@ -68,7 +89,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable-1.3 OO_INSTALL_NAMESPACE: openshift-adp diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml index 754cff273d278..d0a3431e313ef 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml @@ -5,13 +5,34 @@ build_root: tag: rhel-8-golang-1.19-openshift-4.13 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator-1.3 - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator-1.3 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.3 with: oadp-operator-1.3 @@ -34,7 +55,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable-1.3 OO_INSTALL_NAMESPACE: openshift-adp @@ -68,7 +89,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable-1.3 OO_INSTALL_NAMESPACE: openshift-adp diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml index d46622e9060f7..a71d3b91ebdec 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml @@ -5,13 +5,34 @@ build_root: tag: ubi9-v1.23 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator-1.3 - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator-1.3 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.3 with: oadp-operator-1.3 @@ -34,7 +55,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable-1.3 OO_INSTALL_NAMESPACE: openshift-adp @@ -68,7 +89,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable-1.3 OO_INSTALL_NAMESPACE: openshift-adp diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml index e394020976786..23978ba78503b 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml @@ -5,13 +5,34 @@ build_root: tag: ubi9-v1.23 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator-1.3 - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator-1.3 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.3 with: oadp-operator-1.3 @@ -34,7 +55,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable-1.3 OO_INSTALL_NAMESPACE: openshift-adp @@ -68,7 +89,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable-1.3 OO_INSTALL_NAMESPACE: openshift-adp diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yaml index 1aa3d12b3bc55..c43bf1a75c9aa 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yaml @@ -5,13 +5,34 @@ build_root: tag: ubi9-v1.23 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator-1.4 - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator-1.4 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.4 with: oadp-operator-1.4 @@ -35,7 +56,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: FEATURE_GATES: '[''OpenShiftPodSecurityAdmission=false'']' FEATURE_SET: CustomNoUpgrade @@ -71,7 +92,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: FEATURE_GATES: '[''OpenShiftPodSecurityAdmission=false'']' FEATURE_SET: CustomNoUpgrade @@ -99,7 +120,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable-1.4 OO_INSTALL_NAMESPACE: openshift-adp diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.19.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.19.yaml index c204fe0ac8f85..aa14b39143716 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.19.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.19.yaml @@ -5,13 +5,34 @@ build_root: tag: ubi9-v1.23 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator-1.5 - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator-1.5 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.5 with: oadp-operator-1.5 @@ -35,7 +56,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp @@ -69,7 +90,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp @@ -95,7 +116,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp @@ -129,7 +150,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp @@ -155,7 +176,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp @@ -180,7 +201,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.20.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.20.yaml index 8e77b9b8929cb..80f097bd0ff57 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.20.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.20.yaml @@ -5,13 +5,34 @@ build_root: tag: ubi9-v1.23 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator-1.5 - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator-1.5 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.5 with: oadp-operator-1.5 @@ -35,7 +56,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp @@ -69,7 +90,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp @@ -95,7 +116,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp @@ -129,7 +150,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp @@ -155,7 +176,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp @@ -180,7 +201,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.18.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.18.yaml index 9fe564f5684c4..6d46594ce8724 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.18.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.18.yaml @@ -5,13 +5,34 @@ build_root: tag: ubi9-v1.25 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator-1.6 - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator-1.6 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.6 with: oadp-operator-1.6 @@ -34,7 +55,7 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml index 244750d83c978..23aea018b21c0 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml @@ -10,13 +10,34 @@ build_root: tag: ubi9-v1.25 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator-1.6 - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator-1.6 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.6 with: oadp-operator-1.6 @@ -40,8 +61,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -66,8 +88,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -100,8 +123,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -126,8 +150,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -160,8 +185,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -186,8 +212,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -211,8 +238,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -236,8 +264,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml index e64f0e1eacb78..6f927a7a9cfae 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml @@ -5,13 +5,34 @@ build_root: tag: ubi9-v1.25 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator-1.6 - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator-1.6 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.6 with: oadp-operator-1.6 @@ -35,8 +56,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -61,8 +83,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -95,8 +118,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -121,8 +145,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -155,8 +180,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -181,8 +207,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -206,8 +233,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -231,8 +259,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.22.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.22.yaml index 5cc8079ac69e9..c36e26e2c2e39 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.22.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.22.yaml @@ -10,13 +10,34 @@ build_root: tag: ubi9-v1.24 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:latest with: oadp-operator @@ -40,8 +61,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -66,8 +88,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -100,8 +123,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -125,8 +149,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.23.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.23.yaml index dd674b5b0dd5d..c490d66ac7c7c 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.23.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.23.yaml @@ -5,13 +5,34 @@ build_root: tag: ubi9-v1.24 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:latest with: oadp-operator @@ -36,8 +57,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -70,8 +92,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml index c9b197106572e..cdb154c81f3b2 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml @@ -5,13 +5,34 @@ build_root: tag: ubi9-v1.24 images: items: + - dockerfile_literal: | + FROM quay.io/operator-framework/upstream-opm-builder:latest AS builder + COPY manifests/ /tmp/bundle/manifests/ + COPY metadata/ /tmp/bundle/metadata/ + RUN mkdir -p /configs/oadp-operator && \ + opm render /tmp/bundle -o yaml > /configs/oadp-operator/index.yaml && \ + opm validate /configs/oadp-operator + FROM quay.io/operator-framework/opm:latest + COPY --from=builder /configs /configs + EXPOSE 50051 + ENTRYPOINT ["/bin/opm", "serve", "/configs"] + inputs: + oadp-operator-bundle: + paths: + - destination_dir: . + source_path: /manifests + - destination_dir: . + source_path: /metadata + to: oadp-operator-catalog - dockerfile_path: Dockerfile to: oadp-operator - dockerfile_path: build/ci-Dockerfile to: test-oadp-operator operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:latest with: oadp-operator @@ -35,8 +56,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -61,8 +83,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -95,8 +118,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -129,8 +153,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -154,8 +179,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator @@ -179,8 +205,9 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_INDEX: oadp-operator-catalog env: + FEATURE_SET: TechPreviewNoUpgrade OO_CHANNEL: dev OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml index 70181720a0b01..b2102a95e83f3 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml @@ -1,200 +1,6 @@ periodics: - agent: kubernetes cluster: build11 - cron: 13 19 14,28 * * - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - extra_refs: - - base_ref: oadp-1.0 - org: openshift - repo: oadp-operator - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.0-4.12-e2e-test-aws-periodic - reporter_config: - slack: - channel: '#oadp-cicd' - job_states_to_report: - - failure - - error - report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} - :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> :alert-siren: {{end}}' - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --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-test-aws-periodic - - --variant=4.12 - 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/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: 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 -- agent: kubernetes - cluster: build11 - cron: 13 19 14,28 * * - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - extra_refs: - - base_ref: oadp-1.0 - org: openshift - repo: oadp-operator - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.0-4.14-e2e-test-aws-periodic - reporter_config: - slack: - channel: '#oadp-cicd' - job_states_to_report: - - failure - - error - report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} - :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> :alert-siren: {{end}}' - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --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-test-aws-periodic - - --variant=4.14 - 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/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: 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 -- agent: kubernetes - cluster: build03 cron: 0 4 * * * decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml index 4d895590f5e19..3d7cfd8f25117 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml @@ -1,415 +1,5 @@ presubmits: openshift/oadp-operator: - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build03 - context: ci/prow/4.12-ci-index - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.12-ci-index - rerun_command: /test 4.12-ci-index - 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=ci-index - - --variant=4.12 - 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.12-ci-index,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build01 - context: ci/prow/4.12-e2e-test-aws - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.12-e2e-test-aws - rerun_command: /test 4.12-e2e-test-aws - run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --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-test-aws - - --variant=4.12 - 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/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: 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.12-e2e-test-aws,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build03 - context: ci/prow/4.12-images - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.12-images - rerun_command: /test 4.12-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.12 - 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.12-images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build03 - context: ci/prow/4.14-ci-index - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.14-ci-index - rerun_command: /test 4.14-ci-index - 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=ci-index - - --variant=4.14 - 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.14-ci-index,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build01 - context: ci/prow/4.14-e2e-test-aws - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.14-e2e-test-aws - rerun_command: /test 4.14-e2e-test-aws - run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --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-test-aws - - --variant=4.14 - 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/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: 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.14-e2e-test-aws,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build03 - context: ci/prow/4.14-images - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.14-images - rerun_command: /test 4.14-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.14 - 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.14-images,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml index b46f4d00a44ef..a947d06888756 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml @@ -6,7 +6,7 @@ presubmits: - ^oadp-1\.3$ - ^oadp-1\.3- cluster: build11 - context: ci/prow/4.12-ci-index + context: ci/prow/4.12-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -16,15 +16,15 @@ presubmits: ci-operator.openshift.io/variant: "4.12" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.12-ci-index - rerun_command: /test 4.12-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.12-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.12-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=4.12 command: - ci-operator @@ -58,7 +58,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.12-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.12-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -211,7 +211,7 @@ presubmits: - ^oadp-1\.3$ - ^oadp-1\.3- cluster: build11 - context: ci/prow/4.13-ci-index + context: ci/prow/4.13-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -221,15 +221,15 @@ presubmits: ci-operator.openshift.io/variant: "4.13" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.13-ci-index - rerun_command: /test 4.13-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.13-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.13-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=4.13 command: - ci-operator @@ -263,7 +263,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.13-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.13-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -416,7 +416,7 @@ presubmits: - ^oadp-1\.3$ - ^oadp-1\.3- cluster: build11 - context: ci/prow/4.14-ci-index + context: ci/prow/4.14-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -426,15 +426,15 @@ presubmits: ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.14-ci-index - rerun_command: /test 4.14-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.14-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.14-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=4.14 command: - ci-operator @@ -468,7 +468,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.14-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.14-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -621,7 +621,7 @@ presubmits: - ^oadp-1\.3$ - ^oadp-1\.3- cluster: build11 - context: ci/prow/4.15-ci-index + context: ci/prow/4.15-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -631,15 +631,15 @@ presubmits: ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.15-ci-index - rerun_command: /test 4.15-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.15-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.15-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=4.15 command: - ci-operator @@ -673,7 +673,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.15-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.15-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml index 70dc2f4ead220..b05b134f921f6 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml @@ -6,7 +6,7 @@ presubmits: - ^oadp-1\.4$ - ^oadp-1\.4- cluster: build06 - context: ci/prow/4.18-ci-index + context: ci/prow/4.18-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -17,15 +17,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.18" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.18-ci-index - rerun_command: /test 4.18-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.4-4.18-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.18-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=4.18 command: - ci-operator @@ -59,7 +59,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.18-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.18-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-presubmits.yaml index 7ad6ae36fabe3..4eea6c2958ab0 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-presubmits.yaml @@ -6,7 +6,7 @@ presubmits: - ^oadp-1\.5$ - ^oadp-1\.5- cluster: build03 - context: ci/prow/4.19-ci-index + context: ci/prow/4.19-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -17,15 +17,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.19" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.5-4.19-ci-index - rerun_command: /test 4.19-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.5-4.19-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.19-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=4.19 command: - ci-operator @@ -59,7 +59,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.19-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.19-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -390,7 +390,7 @@ presubmits: - ^oadp-1\.5$ - ^oadp-1\.5- cluster: build03 - context: ci/prow/4.20-ci-index + context: ci/prow/4.20-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -401,15 +401,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.5-4.20-ci-index - rerun_command: /test 4.20-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.5-4.20-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.20-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=4.20 command: - ci-operator @@ -443,7 +443,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.20-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.20-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml index 4dbaa28d6fcb9..a94570c1e418f 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml @@ -5,8 +5,8 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- - cluster: build06 - context: ci/prow/4.18-ci-index + cluster: build03 + context: ci/prow/4.18-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -17,15 +17,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.18" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.6-4.18-ci-index - rerun_command: /test 4.18-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.6-4.18-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.18-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=4.18 command: - ci-operator @@ -59,13 +59,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.18-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.18-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: true branches: - ^oadp-1\.6$ - ^oadp-1\.6- - cluster: build06 + cluster: build03 context: ci/prow/4.18-images decorate: true decoration_config: @@ -125,8 +125,8 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- - cluster: build06 - context: ci/prow/4.22-ci-index + cluster: build03 + context: ci/prow/4.22-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -137,15 +137,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.6-4.22-ci-index - rerun_command: /test 4.22-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.6-4.22-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.22-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=4.22 command: - ci-operator @@ -179,7 +179,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.22-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.22-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -537,7 +537,7 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- - cluster: build06 + cluster: build03 context: ci/prow/4.22-images decorate: true decoration_config: @@ -1421,8 +1421,8 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- - cluster: build06 - context: ci/prow/5.0-ci-index + cluster: build03 + context: ci/prow/5.0-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -1433,15 +1433,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.6-5.0-ci-index - rerun_command: /test 5.0-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.6-5.0-ci-bundle-oadp-operator-bundle + rerun_command: /test 5.0-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=5.0 command: - ci-operator @@ -1475,7 +1475,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )5.0-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )5.0-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -1833,7 +1833,7 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- - cluster: build06 + cluster: build03 context: ci/prow/5.0-images decorate: true decoration_config: @@ -1950,7 +1950,7 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- - cluster: build06 + cluster: build03 context: ci/prow/unit-test decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml index 971e27cb1c7bb..b56b269fd860d 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml @@ -6,7 +6,7 @@ presubmits: - ^oadp-dev$ - ^oadp-dev- cluster: build11 - context: ci/prow/4.22-ci-index + context: ci/prow/4.22-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -17,15 +17,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-dev-4.22-ci-index - rerun_command: /test 4.22-ci-index + name: pull-ci-openshift-oadp-operator-oadp-dev-4.22-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.22-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=4.22 command: - ci-operator @@ -59,7 +59,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.22-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.22-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -478,7 +478,7 @@ presubmits: - ^oadp-dev$ - ^oadp-dev- cluster: build11 - context: ci/prow/4.23-ci-index + context: ci/prow/4.23-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -489,15 +489,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.23" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-dev-4.23-ci-index - rerun_command: /test 4.23-ci-index + name: pull-ci-openshift-oadp-operator-oadp-dev-4.23-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.23-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=4.23 command: - ci-operator @@ -531,7 +531,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.23-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.23-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -687,7 +687,7 @@ presubmits: - ^oadp-dev$ - ^oadp-dev- cluster: build11 - context: ci/prow/5.0-ci-index + context: ci/prow/5.0-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -698,15 +698,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-dev-5.0-ci-index - rerun_command: /test 5.0-ci-index + name: pull-ci-openshift-oadp-operator-oadp-dev-5.0-ci-bundle-oadp-operator-bundle + rerun_command: /test 5.0-ci-bundle-oadp-operator-bundle 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=ci-index + - --target=oadp-operator-bundle - --variant=5.0 command: - ci-operator @@ -740,7 +740,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )5.0-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )5.0-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: