diff --git a/ci-operator/config/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master__v4.14.yaml b/ci-operator/config/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master__v4.14.yaml index 57faf7d17ecc3..aa82d41976b44 100644 --- a/ci-operator/config/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master__v4.14.yaml +++ b/ci-operator/config/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master__v4.14.yaml @@ -22,18 +22,28 @@ images: - dockerfile_path: openshift-ci/build-root/Dockerfile from: oc-bin-image to: dependencies - - context_dir: . + - additional_architectures: + - arm64 + context_dir: . from: src to: gitops-operator operator: bundles: - as: gitops-operator-bundle + capabilities: + - arm64 context_dir: bundle/ dockerfile_path: bundle.Dockerfile substitutions: - pullspec: quay.io/redhat-developer/gitops-operator:latest with: pipeline:gitops-operator releases: + arm64-latest: + candidate: + architecture: arm64 + product: ocp + stream: nightly + version: "4.14" initial: integration: name: "4.14" @@ -50,19 +60,37 @@ resources: memory: 6Gi tests: - as: kuttl-sequential + capabilities: + - arm64 optional: true skip_if_only_changed: ^docs/|\.(md|adoc)$|^(README|LICENSE|OWNERS)$ steps: cluster_profile: gitops-aws + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: ocp-gitops-qe.com + OCP_ARCH: arm64 test: - as: install cli: latest commands: | oc create namespace openshift-gitops-operator oc get ns openshift-gitops-operator -o yaml - operator-sdk run bundle --security-context-config restricted -n openshift-gitops-operator "$OO_BUNDLE" --timeout 10m + if ! operator-sdk run bundle --security-context-config restricted -n openshift-gitops-operator "$OO_BUNDLE" --timeout 10m; then + echo "=== Operator installation failed, gathering diagnostics ===" + echo "=== CSV Status ===" + oc get csv -n openshift-gitops-operator -o yaml || true + echo "=== Operator Pods ===" + oc get pods -n openshift-gitops-operator -o wide || true + echo "=== Operator Pod Describe ===" + oc describe pods -n openshift-gitops-operator || true + echo "=== Operator Logs ===" + oc logs -n openshift-gitops-operator -l control-plane=gitops-operator --all-containers=true --tail=100 || true + echo "=== Events ===" + oc get events -n openshift-gitops-operator --sort-by='.lastTimestamp' | tail -30 || true + exit 1 + fi oc wait --for condition=Available -n openshift-gitops-operator deployment openshift-gitops-operator-controller-manager dependencies: - env: OO_BUNDLE @@ -84,19 +112,37 @@ tests: timeout: 3h30m0s workflow: ipi-aws - as: kuttl-parallel + capabilities: + - arm64 optional: true skip_if_only_changed: ^docs/|\.(md|adoc)$|^(README|LICENSE|OWNERS)$ steps: cluster_profile: gitops-aws + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: ocp-gitops-qe.com + OCP_ARCH: arm64 test: - as: install cli: latest commands: | oc create namespace openshift-gitops-operator oc get ns openshift-gitops-operator -o yaml - operator-sdk run bundle --security-context-config restricted -n openshift-gitops-operator "$OO_BUNDLE" --timeout 10m + if ! operator-sdk run bundle --security-context-config restricted -n openshift-gitops-operator "$OO_BUNDLE" --timeout 10m; then + echo "=== Operator installation failed, gathering diagnostics ===" + echo "=== CSV Status ===" + oc get csv -n openshift-gitops-operator -o yaml || true + echo "=== Operator Pods ===" + oc get pods -n openshift-gitops-operator -o wide || true + echo "=== Operator Pod Describe ===" + oc describe pods -n openshift-gitops-operator || true + echo "=== Operator Logs ===" + oc logs -n openshift-gitops-operator -l control-plane=gitops-operator --all-containers=true --tail=100 || true + echo "=== Events ===" + oc get events -n openshift-gitops-operator --sort-by='.lastTimestamp' | tail -30 || true + exit 1 + fi oc wait --for condition=Available -n openshift-gitops-operator deployment openshift-gitops-operator-controller-manager dependencies: - env: OO_BUNDLE @@ -117,11 +163,17 @@ tests: memory: 6Gi workflow: ipi-aws - as: e2e + capabilities: + - arm64 + optional: true skip_if_only_changed: ^docs/|\.(md|adoc)$|^(README|LICENSE|OWNERS)$ steps: cluster_profile: gitops-aws + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: ocp-gitops-qe.com + OCP_ARCH: arm64 test: - as: e2e-steps commands: scripts/openshiftci-presubmit-all-tests.sh diff --git a/ci-operator/config/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master__v4.19.yaml b/ci-operator/config/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master__v4.19.yaml index d65d7ce4ac74b..c6a6edf0c27b4 100644 --- a/ci-operator/config/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master__v4.19.yaml +++ b/ci-operator/config/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master__v4.19.yaml @@ -22,18 +22,28 @@ images: - dockerfile_path: openshift-ci/build-root/Dockerfile from: oc-bin-image to: dependencies - - context_dir: . + - additional_architectures: + - arm64 + context_dir: . from: src to: gitops-operator operator: bundles: - as: gitops-operator-bundle + capabilities: + - arm64 context_dir: bundle/ dockerfile_path: bundle.Dockerfile substitutions: - pullspec: quay.io/redhat-developer/gitops-operator:latest with: pipeline:gitops-operator releases: + arm64-latest: + candidate: + architecture: arm64 + product: ocp + stream: nightly + version: "4.19" initial: integration: name: "4.19" @@ -50,18 +60,36 @@ resources: memory: 6Gi tests: - as: kuttl-sequential + capabilities: + - arm64 skip_if_only_changed: ^docs/|\.(md|adoc)$|^(README|LICENSE|OWNERS)$ steps: cluster_profile: gitops-aws + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: ocp-gitops-qe.com + OCP_ARCH: arm64 test: - as: install cli: latest commands: | oc create namespace openshift-gitops-operator oc get ns openshift-gitops-operator -o yaml - operator-sdk run bundle --security-context-config restricted -n openshift-gitops-operator "$OO_BUNDLE" --timeout 10m + if ! operator-sdk run bundle --security-context-config restricted -n openshift-gitops-operator "$OO_BUNDLE" --timeout 10m; then + echo "=== Operator installation failed, gathering diagnostics ===" + echo "=== CSV Status ===" + oc get csv -n openshift-gitops-operator -o yaml || true + echo "=== Operator Pods ===" + oc get pods -n openshift-gitops-operator -o wide || true + echo "=== Operator Pod Describe ===" + oc describe pods -n openshift-gitops-operator || true + echo "=== Operator Logs ===" + oc logs -n openshift-gitops-operator -l control-plane=gitops-operator --all-containers=true --tail=100 || true + echo "=== Events ===" + oc get events -n openshift-gitops-operator --sort-by='.lastTimestamp' | tail -30 || true + exit 1 + fi oc wait --for condition=Available -n openshift-gitops-operator deployment openshift-gitops-operator-controller-manager dependencies: - env: OO_BUNDLE @@ -83,18 +111,36 @@ tests: timeout: 3h30m0s workflow: ipi-aws - as: kuttl-parallel + capabilities: + - arm64 skip_if_only_changed: ^docs/|\.(md|adoc)$|^(README|LICENSE|OWNERS)$ steps: cluster_profile: gitops-aws + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: ocp-gitops-qe.com + OCP_ARCH: arm64 test: - as: install cli: latest commands: | oc create namespace openshift-gitops-operator oc get ns openshift-gitops-operator -o yaml - operator-sdk run bundle --security-context-config restricted -n openshift-gitops-operator "$OO_BUNDLE" --timeout 10m + if ! operator-sdk run bundle --security-context-config restricted -n openshift-gitops-operator "$OO_BUNDLE" --timeout 10m; then + echo "=== Operator installation failed, gathering diagnostics ===" + echo "=== CSV Status ===" + oc get csv -n openshift-gitops-operator -o yaml || true + echo "=== Operator Pods ===" + oc get pods -n openshift-gitops-operator -o wide || true + echo "=== Operator Pod Describe ===" + oc describe pods -n openshift-gitops-operator || true + echo "=== Operator Logs ===" + oc logs -n openshift-gitops-operator -l control-plane=gitops-operator --all-containers=true --tail=100 || true + echo "=== Events ===" + oc get events -n openshift-gitops-operator --sort-by='.lastTimestamp' | tail -30 || true + exit 1 + fi oc wait --for condition=Available -n openshift-gitops-operator deployment openshift-gitops-operator-controller-manager dependencies: - env: OO_BUNDLE @@ -115,11 +161,16 @@ tests: memory: 6Gi workflow: ipi-aws - as: e2e + capabilities: + - arm64 skip_if_only_changed: ^docs/|\.(md|adoc)$|^(README|LICENSE|OWNERS)$ steps: cluster_profile: gitops-aws + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: ocp-gitops-qe.com + OCP_ARCH: arm64 test: - as: e2e-steps commands: scripts/openshiftci-presubmit-all-tests.sh diff --git a/ci-operator/jobs/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master-presubmits.yaml b/ci-operator/jobs/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master-presubmits.yaml index c323fe406fa42..8e7edfd6c1804 100644 --- a/ci-operator/jobs/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master-presubmits.yaml +++ b/ci-operator/jobs/redhat-developer/gitops-operator/redhat-developer-gitops-operator-master-presubmits.yaml @@ -80,6 +80,7 @@ presubmits: context: ci/prow/v4.14-ci-index-gitops-operator-bundle decorate: true labels: + capability/arm64: arm64 ci-operator.openshift.io/variant: v4.14 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -135,12 +136,14 @@ presubmits: context: ci/prow/v4.14-e2e decorate: true labels: + capability/arm64: arm64 ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: gitops-aws ci-operator.openshift.io/variant: v4.14 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-redhat-developer-gitops-operator-master-v4.14-e2e + optional: true rerun_command: /test v4.14-e2e skip_if_only_changed: ^docs/|\.(md|adoc)$|^(README|LICENSE|OWNERS)$ spec: @@ -218,6 +221,7 @@ presubmits: context: ci/prow/v4.14-images decorate: true labels: + capability/arm64: arm64 ci-operator.openshift.io/variant: v4.14 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -273,6 +277,7 @@ presubmits: context: ci/prow/v4.14-kuttl-parallel decorate: true labels: + capability/arm64: arm64 ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: gitops-aws ci-operator.openshift.io/variant: v4.14 @@ -357,6 +362,7 @@ presubmits: context: ci/prow/v4.14-kuttl-sequential decorate: true labels: + capability/arm64: arm64 ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: gitops-aws ci-operator.openshift.io/variant: v4.14 @@ -441,6 +447,7 @@ presubmits: context: ci/prow/v4.19-ci-index-gitops-operator-bundle decorate: true labels: + capability/arm64: arm64 ci-operator.openshift.io/variant: v4.19 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -496,6 +503,7 @@ presubmits: context: ci/prow/v4.19-e2e decorate: true labels: + capability/arm64: arm64 ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: gitops-aws ci-operator.openshift.io/variant: v4.19 @@ -579,6 +587,7 @@ presubmits: context: ci/prow/v4.19-images decorate: true labels: + capability/arm64: arm64 ci-operator.openshift.io/variant: v4.19 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -634,6 +643,7 @@ presubmits: context: ci/prow/v4.19-kuttl-parallel decorate: true labels: + capability/arm64: arm64 ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: gitops-aws ci-operator.openshift.io/variant: v4.19 @@ -717,6 +727,7 @@ presubmits: context: ci/prow/v4.19-kuttl-sequential decorate: true labels: + capability/arm64: arm64 ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: gitops-aws ci-operator.openshift.io/variant: v4.19