diff --git a/ci-operator/config/openshift-assisted/cluster-api-provider-openshift-assisted/openshift-assisted-cluster-api-provider-openshift-assisted-master.yaml b/ci-operator/config/openshift-assisted/cluster-api-provider-openshift-assisted/openshift-assisted-cluster-api-provider-openshift-assisted-master.yaml index 728b23afe1674..5a090c975738b 100644 --- a/ci-operator/config/openshift-assisted/cluster-api-provider-openshift-assisted/openshift-assisted-cluster-api-provider-openshift-assisted-master.yaml +++ b/ci-operator/config/openshift-assisted/cluster-api-provider-openshift-assisted/openshift-assisted-cluster-api-provider-openshift-assisted-master.yaml @@ -73,6 +73,14 @@ tests: steps: cluster_profile: packet-assisted workflow: assisted-ofcir-baremetal-capi +- always_run: false + as: e2e-capi-sno + capabilities: + - intranet + optional: true + steps: + cluster_profile: packet-assisted + workflow: assisted-ofcir-baremetal-capi-sno - as: e2e-capi-multinode-postsubmit capabilities: - intranet diff --git a/ci-operator/jobs/openshift-assisted/cluster-api-provider-openshift-assisted/openshift-assisted-cluster-api-provider-openshift-assisted-master-presubmits.yaml b/ci-operator/jobs/openshift-assisted/cluster-api-provider-openshift-assisted/openshift-assisted-cluster-api-provider-openshift-assisted-master-presubmits.yaml index 3acd1213daa52..5165a40b2f6e6 100644 --- a/ci-operator/jobs/openshift-assisted/cluster-api-provider-openshift-assisted/openshift-assisted-cluster-api-provider-openshift-assisted-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-assisted/cluster-api-provider-openshift-assisted/openshift-assisted-cluster-api-provider-openshift-assisted-master-presubmits.yaml @@ -214,6 +214,91 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-capi-multinode,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build09 + context: ci/prow/e2e-capi-sno + decorate: true + decoration_config: + skip_cloning: true + labels: + capability/intranet: intranet + ci-operator.openshift.io/cloud: packet-edge + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted + ci.openshift.io/generator: prowgen + job-release: "4.18" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-assisted-cluster-api-provider-openshift-assisted-master-e2e-capi-sno + optional: true + rerun_command: /test e2e-capi-sno + 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-capi-sno + 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( | .* )e2e-capi-sno,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/step-registry/assisted/capi/test/assisted-capi-test-commands.sh b/ci-operator/step-registry/assisted/capi/test/assisted-capi-test-commands.sh index 14d835884391e..44da3b602395f 100644 --- a/ci-operator/step-registry/assisted/capi/test/assisted-capi-test-commands.sh +++ b/ci-operator/step-registry/assisted/capi/test/assisted-capi-test-commands.sh @@ -27,6 +27,8 @@ export GOCACHE export HOME export DIST_DIR export CONTAINER_TAG +export CLUSTER_TOPOLOGY +export NUMBER_OF_NODES make generate && make manifests && make build-installer diff --git a/ci-operator/step-registry/assisted/capi/test/assisted-capi-test-ref.yaml b/ci-operator/step-registry/assisted/capi/test/assisted-capi-test-ref.yaml index 7de41476bc4ea..1d299c9f83cba 100644 --- a/ci-operator/step-registry/assisted/capi/test/assisted-capi-test-ref.yaml +++ b/ci-operator/step-registry/assisted/capi/test/assisted-capi-test-ref.yaml @@ -19,5 +19,11 @@ ref: default: "false" - name: TEST_TARGET default: "e2e-test" + - name: CLUSTER_TOPOLOGY + default: "multinode" + documentation: Cluster topology to deploy. Valid values are "sno" or "multinode". + - name: NUMBER_OF_NODES + default: "7" + documentation: Number of nodes to provision. Use "1" for SNO, "7" for multinode. documentation: |- The Baremetal DS E2E assisted step executes the common end-to-end test suite. diff --git a/ci-operator/step-registry/assisted/ofcir/baremetal/capi/sno/OWNERS b/ci-operator/step-registry/assisted/ofcir/baremetal/capi/sno/OWNERS new file mode 100644 index 0000000000000..132f04d22bb29 --- /dev/null +++ b/ci-operator/step-registry/assisted/ofcir/baremetal/capi/sno/OWNERS @@ -0,0 +1,2 @@ +approvers: + - assisted-cicd diff --git a/ci-operator/step-registry/assisted/ofcir/baremetal/capi/sno/assisted-ofcir-baremetal-capi-sno-workflow.metadata.json b/ci-operator/step-registry/assisted/ofcir/baremetal/capi/sno/assisted-ofcir-baremetal-capi-sno-workflow.metadata.json new file mode 100644 index 0000000000000..f2c8cce50c00b --- /dev/null +++ b/ci-operator/step-registry/assisted/ofcir/baremetal/capi/sno/assisted-ofcir-baremetal-capi-sno-workflow.metadata.json @@ -0,0 +1,8 @@ +{ + "path": "assisted/ofcir/baremetal/capi/sno/assisted-ofcir-baremetal-capi-sno-workflow.yaml", + "owners": { + "approvers": [ + "assisted-cicd" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/assisted/ofcir/baremetal/capi/sno/assisted-ofcir-baremetal-capi-sno-workflow.yaml b/ci-operator/step-registry/assisted/ofcir/baremetal/capi/sno/assisted-ofcir-baremetal-capi-sno-workflow.yaml new file mode 100644 index 0000000000000..cfe5fced2542b --- /dev/null +++ b/ci-operator/step-registry/assisted/ofcir/baremetal/capi/sno/assisted-ofcir-baremetal-capi-sno-workflow.yaml @@ -0,0 +1,20 @@ +workflow: + as: assisted-ofcir-baremetal-capi-sno + steps: + cluster_profile: packet-assisted + allow_best_effort_post_steps: true + allow_skip_on_success: true + pre: + - ref: ofcir-acquire + - ref: assisted-ofcir-setup + test: + - ref: assisted-capi-test + post: + - ref: ofcir-gather + - ref: ofcir-release + env: + CLUSTERTYPE: "assisted_medium_el9" + CLUSTER_TOPOLOGY: "sno" + NUMBER_OF_NODES: "1" + documentation: |- + This workflow executes e2e tests for CAPI OpenshiftAssisted bootstrap and controlplane providers in SNO (Single Node OpenShift) topology