diff --git a/ci-operator/config/migtools/kubevirt-datamover-controller/migtools-kubevirt-datamover-controller-oadp-1.6.yaml b/ci-operator/config/migtools/kubevirt-datamover-controller/migtools-kubevirt-datamover-controller-oadp-1.6.yaml index a24d03ee6f62b..a8eedbd5df5db 100644 --- a/ci-operator/config/migtools/kubevirt-datamover-controller/migtools-kubevirt-datamover-controller-oadp-1.6.yaml +++ b/ci-operator/config/migtools/kubevirt-datamover-controller/migtools-kubevirt-datamover-controller-oadp-1.6.yaml @@ -1,4 +1,8 @@ base_images: + claude-ai-helpers: + name: claude-ai-helpers + namespace: ci + tag: latest test-oadp-operator: name: oadp-operator-e2e-tests namespace: konveyor @@ -38,13 +42,16 @@ tests: steps: cluster_profile: openshift-org-aws env: + OADP_BRANCH: oadp-1.6 OO_BUNDLE: quay-proxy.ci.openshift.org/openshift/ci:konveyor_oadp-operator-bundle_oadp-1.6 OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp OO_INSTALL_TIMEOUT_MINUTES: "25" OO_MIRROR_TO_CLUSTER_REGISTRY: "true" OO_PSA_ENFORCE_PRIVILEGED: "true" + TEST_NAME: virt-kdm-e2e-test-aws post: + - ref: oadp-analyze-e2e-failure - chain: ipi-aws-post pre: - chain: ipi-aws-pre diff --git a/ci-operator/config/migtools/kubevirt-datamover-controller/migtools-kubevirt-datamover-controller-oadp-dev.yaml b/ci-operator/config/migtools/kubevirt-datamover-controller/migtools-kubevirt-datamover-controller-oadp-dev.yaml index c27924633e3c6..1f65acf0aed96 100644 --- a/ci-operator/config/migtools/kubevirt-datamover-controller/migtools-kubevirt-datamover-controller-oadp-dev.yaml +++ b/ci-operator/config/migtools/kubevirt-datamover-controller/migtools-kubevirt-datamover-controller-oadp-dev.yaml @@ -1,4 +1,8 @@ base_images: + claude-ai-helpers: + name: claude-ai-helpers + namespace: ci + tag: latest test-oadp-operator: name: oadp-operator-e2e-tests namespace: konveyor @@ -38,13 +42,16 @@ tests: steps: cluster_profile: openshift-org-aws env: + OADP_BRANCH: oadp-dev OO_BUNDLE: quay-proxy.ci.openshift.org/openshift/ci:konveyor_oadp-operator-bundle_oadp-dev OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp OO_INSTALL_TIMEOUT_MINUTES: "25" OO_MIRROR_TO_CLUSTER_REGISTRY: "true" OO_PSA_ENFORCE_PRIVILEGED: "true" + TEST_NAME: virt-kdm-e2e-test-aws post: + - ref: oadp-analyze-e2e-failure - chain: ipi-aws-post pre: - chain: ipi-aws-pre diff --git a/ci-operator/config/migtools/kubevirt-datamover-plugin/migtools-kubevirt-datamover-plugin-oadp-1.6.yaml b/ci-operator/config/migtools/kubevirt-datamover-plugin/migtools-kubevirt-datamover-plugin-oadp-1.6.yaml index 9426d695aeb49..9196da6ba0e34 100644 --- a/ci-operator/config/migtools/kubevirt-datamover-plugin/migtools-kubevirt-datamover-plugin-oadp-1.6.yaml +++ b/ci-operator/config/migtools/kubevirt-datamover-plugin/migtools-kubevirt-datamover-plugin-oadp-1.6.yaml @@ -1,4 +1,8 @@ base_images: + claude-ai-helpers: + name: claude-ai-helpers + namespace: ci + tag: latest test-oadp-operator: name: oadp-operator-e2e-tests namespace: konveyor @@ -38,13 +42,16 @@ tests: steps: cluster_profile: openshift-org-aws env: + OADP_BRANCH: oadp-1.6 OO_BUNDLE: quay-proxy.ci.openshift.org/openshift/ci:konveyor_oadp-operator-bundle_oadp-1.6 OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp OO_INSTALL_TIMEOUT_MINUTES: "25" OO_MIRROR_TO_CLUSTER_REGISTRY: "true" OO_PSA_ENFORCE_PRIVILEGED: "true" + TEST_NAME: virt-kdm-e2e-test-aws post: + - ref: oadp-analyze-e2e-failure - chain: ipi-aws-post pre: - chain: ipi-aws-pre diff --git a/ci-operator/config/migtools/kubevirt-datamover-plugin/migtools-kubevirt-datamover-plugin-oadp-dev.yaml b/ci-operator/config/migtools/kubevirt-datamover-plugin/migtools-kubevirt-datamover-plugin-oadp-dev.yaml index 49cacade5f1e2..ba652421041df 100644 --- a/ci-operator/config/migtools/kubevirt-datamover-plugin/migtools-kubevirt-datamover-plugin-oadp-dev.yaml +++ b/ci-operator/config/migtools/kubevirt-datamover-plugin/migtools-kubevirt-datamover-plugin-oadp-dev.yaml @@ -1,4 +1,8 @@ base_images: + claude-ai-helpers: + name: claude-ai-helpers + namespace: ci + tag: latest test-oadp-operator: name: oadp-operator-e2e-tests namespace: konveyor @@ -38,13 +42,16 @@ tests: steps: cluster_profile: openshift-org-aws env: + OADP_BRANCH: oadp-dev OO_BUNDLE: quay-proxy.ci.openshift.org/openshift/ci:konveyor_oadp-operator-bundle_oadp-dev OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp OO_INSTALL_TIMEOUT_MINUTES: "25" OO_MIRROR_TO_CLUSTER_REGISTRY: "true" OO_PSA_ENFORCE_PRIVILEGED: "true" + TEST_NAME: virt-kdm-e2e-test-aws post: + - ref: oadp-analyze-e2e-failure - chain: ipi-aws-post pre: - chain: ipi-aws-pre 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 f1fe4579ab610..642b7d924f092 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 @@ -241,7 +241,7 @@ tests: memory: 512Mi workflow: optional-operators-ci-aws - always_run: false - as: e2e-test-kubevirt-aws + as: virt-nokdm-e2e-test-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws @@ -253,13 +253,43 @@ tests: OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator OO_TARGET_NAMESPACES: '!install' - TEST_NAME: e2e-test-kubevirt-aws + TEST_NAME: virt-nokdm-e2e-test-aws post: - ref: oadp-analyze-e2e-failure test: - as: e2e cli: latest - commands: make TEST_VIRT=true test-e2e + commands: make TEST_VIRT=true TEST_VIRT_KDM=false test-e2e + credentials: + - mount_path: /var/run/oadp-credentials + name: oadp-credentials + namespace: test-credentials + from: test-oadp-operator + resources: + requests: + cpu: 1000m + memory: 512Mi + workflow: optional-operators-ci-aws +- always_run: false + as: virt-kdm-e2e-test-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh + steps: + cluster_profile: openshift-org-aws + dependencies: + OO_INDEX: ci-index + env: + OADP_BRANCH: oadp-dev + OO_CHANNEL: dev + OO_INSTALL_NAMESPACE: openshift-adp + OO_PACKAGE: oadp-operator + OO_TARGET_NAMESPACES: '!install' + TEST_NAME: virt-kdm-e2e-test-aws + post: + - ref: oadp-analyze-e2e-failure + test: + - as: e2e + cli: latest + commands: make TEST_VIRT_KDM=true test-e2e credentials: - mount_path: /var/run/oadp-credentials name: oadp-credentials 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 901efacc2c936..bbf8052ed7c61 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 @@ -917,13 +917,73 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )5.0-e2e-test-cli-aws,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^oadp-dev$ + - ^oadp-dev- + cluster: build05 + context: ci/prow/5.0-images + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + - build/ci-Dockerfile + labels: + ci-operator.openshift.io/variant: "5.0" + 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-images + rerun_command: /test 5.0-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=5.0 + 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( | .* )5.0-images,?($|\s.*) - agent: kubernetes always_run: false branches: - ^oadp-dev$ - ^oadp-dev- cluster: build06 - context: ci/prow/5.0-e2e-test-kubevirt-aws + context: ci/prow/5.0-virt-kdm-e2e-test-aws decorate: true decoration_config: sparse_checkout_files: @@ -936,8 +996,8 @@ 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-e2e-test-kubevirt-aws - rerun_command: /test 5.0-e2e-test-kubevirt-aws + name: pull-ci-openshift-oadp-operator-oadp-dev-5.0-virt-kdm-e2e-test-aws + rerun_command: /test 5.0-virt-kdm-e2e-test-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh spec: containers: @@ -947,7 +1007,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-test-kubevirt-aws + - --target=virt-kdm-e2e-test-aws - --variant=5.0 command: - ci-operator @@ -1004,43 +1064,62 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )5.0-e2e-test-kubevirt-aws,?($|\s.*) + trigger: (?m)^/test( | .* )5.0-virt-kdm-e2e-test-aws,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^oadp-dev$ - ^oadp-dev- - cluster: build05 - context: ci/prow/5.0-images + cluster: build06 + context: ci/prow/5.0-virt-nokdm-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: "5.0" 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-images - rerun_command: /test 5.0-images + name: pull-ci-openshift-oadp-operator-oadp-dev-5.0-virt-nokdm-e2e-test-aws + rerun_command: /test 5.0-virt-nokdm-e2e-test-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh 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 - - --target=[images] + - --secret-dir=/secrets/ci-pull-credentials + - --target=virt-nokdm-e2e-test-aws - --variant=5.0 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 @@ -1055,6 +1134,15 @@ presubmits: 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 @@ -1064,7 +1152,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )5.0-images,?($|\s.*) + trigger: (?m)^/test( | .* )5.0-virt-nokdm-e2e-test-aws,?($|\s.*) - agent: kubernetes always_run: true branches: