diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.14__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.14__periodics.yaml index caa113be523f..4f2c89147d01 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.14__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.14__periodics.yaml @@ -150,11 +150,8 @@ tests: NETWORK_TYPE=OVNKubernetes VM_EXTRADISKS=true VM_EXTRADISKS_LIST=vda - VM_EXTRADISKS_SIZE=1024G + VM_EXTRADISKS_SIZE=500G NUM_EXTRA_WORKERS=3 - EXTRA_WORKER_VCPU=8 - EXTRA_WORKER_MEMORY=16384 - EXTRA_WORKER_DISK=100 IP_STACK: v4v6 LVM_OPERATOR_SUB_CHANNEL: stable-4.14 MCE_VERSION: "2.4" @@ -170,11 +167,8 @@ tests: NETWORK_TYPE=OVNKubernetes VM_EXTRADISKS=true VM_EXTRADISKS_LIST=vda - VM_EXTRADISKS_SIZE=1024G + VM_EXTRADISKS_SIZE=500G NUM_EXTRA_WORKERS=3 - EXTRA_WORKER_VCPU=8 - EXTRA_WORKER_MEMORY=16384 - EXTRA_WORKER_DISK=100 IP_STACK: v4v6 LVM_OPERATOR_SUB_CHANNEL: stable-4.14 MCE_VERSION: "2.4" diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.15__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.15__periodics.yaml index 8bb72d8c7ab6..6a7dd6171b1b 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.15__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.15__periodics.yaml @@ -119,11 +119,8 @@ tests: NETWORK_TYPE=OVNKubernetes VM_EXTRADISKS=true VM_EXTRADISKS_LIST=vda - VM_EXTRADISKS_SIZE=1024G + VM_EXTRADISKS_SIZE=500G NUM_EXTRA_WORKERS=3 - EXTRA_WORKER_VCPU=8 - EXTRA_WORKER_MEMORY=16384 - EXTRA_WORKER_DISK=100 IP_STACK: v4v6 LVM_OPERATOR_SUB_CHANNEL: stable-4.15 MCE_VERSION: "2.5" @@ -148,11 +145,8 @@ tests: NETWORK_TYPE=OVNKubernetes VM_EXTRADISKS=true VM_EXTRADISKS_LIST=vda - VM_EXTRADISKS_SIZE=1024G + VM_EXTRADISKS_SIZE=500G NUM_EXTRA_WORKERS=3 - EXTRA_WORKER_VCPU=8 - EXTRA_WORKER_MEMORY=16384 - EXTRA_WORKER_DISK=100 IP_STACK: v4v6 LVM_OPERATOR_SUB_CHANNEL: stable-4.15 MCE_VERSION: "2.5" diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16__periodics.yaml index 6fe0524b131c..b6ad3aa79ef8 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16__periodics.yaml @@ -123,13 +123,15 @@ tests: env: MCE_VERSION: "2.5" workflow: hypershift-mce-aws-conformance -- as: e2e-agent-ovn-conformance - cron: 0 4 * * * +- as: e2e-mce-agent-connected-ipv4-metal3-conformance + cluster: build05 + cron: 0 0 * * * steps: cluster_profile: equinix-ocp-metal - dependencies: - INDEX_IMAGE: assisted-service-index - workflow: hypershift-agent-conformance + env: + LVM_OPERATOR_SUB_CHANNEL: stable-4.16 + MCE_VERSION: "2.6" + workflow: hypershift-mce-agent-metal3-conformance - as: e2e-kubevirt-metal cron: 0 4 * * * steps: diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.16-periodics.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.16-periodics.yaml index 9726435a11d7..8530e40ee8ed 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.16-periodics.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.16-periodics.yaml @@ -1,85 +1,4 @@ periodics: -- agent: kubernetes - cluster: build03 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: release-4.16 - org: openshift - repo: hypershift - labels: - ci-operator.openshift.io/cloud: equinix-ocp-metal - ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal - ci-operator.openshift.io/variant: periodics - ci.openshift.io/generator: prowgen - job-release: "4.16" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-agent-ovn-conformance - 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 - - --secret-dir=/usr/local/e2e-agent-ovn-conformance-cluster-profile - - --target=e2e-agent-ovn-conformance - - --variant=periodics - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-agent-ovn-conformance-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-equinix-ocp-metal - - 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 */6 * * * @@ -875,6 +794,88 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + cron: 0 0 * * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-4.16 + org: openshift + repo: hypershift + labels: + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci-operator.openshift.io/cluster: build05 + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.16" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-mce-agent-connected-ipv4-metal3-conformance + 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 + - --secret-dir=/usr/local/e2e-mce-agent-connected-ipv4-metal3-conformance-cluster-profile + - --target=e2e-mce-agent-connected-ipv4-metal3-conformance + - --variant=periodics + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/e2e-mce-agent-connected-ipv4-metal3-conformance-cluster-profile + name: cluster-profile + - 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: cluster-profile + secret: + secretName: cluster-secrets-equinix-ocp-metal + - 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 6 * * * diff --git a/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh b/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh index b575962c2df4..318aedba344c 100644 --- a/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh +++ b/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh @@ -45,6 +45,7 @@ fi --api-server-address=api.${CLUSTER_NAME}.${BASEDOMAIN} \ --image-content-sources "${SHARED_DIR}/mgmt_icsp.yaml" \ --ssh-key="${SHARED_DIR}/id_rsa.pub" \ + --network-type=OVNKubernetes \ --release-image ${RELEASE_IMAGE} if (( $(awk 'BEGIN {print ("'"$MCE_VERSION"'" < 2.4)}') )); then diff --git a/ci-operator/step-registry/hypershift/mce/agent/destroy/hypershift-mce-agent-destroy-chain.yaml b/ci-operator/step-registry/hypershift/mce/agent/destroy/hypershift-mce-agent-destroy-chain.yaml index 9e48cc587d8d..3c715d10e4d6 100644 --- a/ci-operator/step-registry/hypershift/mce/agent/destroy/hypershift-mce-agent-destroy-chain.yaml +++ b/ci-operator/step-registry/hypershift/mce/agent/destroy/hypershift-mce-agent-destroy-chain.yaml @@ -26,6 +26,11 @@ chain: fi CLUSTER_NAME="$(echo -n $PROW_JOB_ID|sha256sum|cut -c-20)" + + oc get machine -n "local-cluster-$CLUSTER_NAME" -o=jsonpath='{.items[*].metadata.name}' | \ + while read -r machine_name; do + oc patch machine "$machine_name" -n "local-cluster-$CLUSTER_NAME" -p '{"metadata":{"finalizers":[]}}' --type=merge + done echo "$(date) Deleting HyperShift cluster ${CLUSTER_NAME}" /tmp/${HYPERSHIFT_NAME} destroy cluster agent \ diff --git a/ci-operator/step-registry/hypershift/mce/agent/disconnected/create/hostedcluster/hypershift-mce-agent-disconnected-create-hostedcluster-commands.sh b/ci-operator/step-registry/hypershift/mce/agent/disconnected/create/hostedcluster/hypershift-mce-agent-disconnected-create-hostedcluster-commands.sh index 76e212efa8be..4686179dd993 100644 --- a/ci-operator/step-registry/hypershift/mce/agent/disconnected/create/hostedcluster/hypershift-mce-agent-disconnected-create-hostedcluster-commands.sh +++ b/ci-operator/step-registry/hypershift/mce/agent/disconnected/create/hostedcluster/hypershift-mce-agent-disconnected-create-hostedcluster-commands.sh @@ -66,6 +66,7 @@ fi --base-domain=\${BASEDOMAIN} \ --api-server-address=api.\${CLUSTER_NAME}.\${BASEDOMAIN} \ --image-content-sources "/home/mgmt_icsp.yaml" \ + --network-type=OVNKubernetes \ --release-image \${PLAYLOADIMAGE} echo "Waiting for cluster to become available" diff --git a/ci-operator/step-registry/hypershift/mce/agent/manual/conformance/hypershift-mce-agent-manual-conformance-workflow.yaml b/ci-operator/step-registry/hypershift/mce/agent/manual/conformance/hypershift-mce-agent-manual-conformance-workflow.yaml index 3c5c48c36300..887f7b4f2b8c 100644 --- a/ci-operator/step-registry/hypershift/mce/agent/manual/conformance/hypershift-mce-agent-manual-conformance-workflow.yaml +++ b/ci-operator/step-registry/hypershift/mce/agent/manual/conformance/hypershift-mce-agent-manual-conformance-workflow.yaml @@ -28,8 +28,5 @@ workflow: NETWORK_TYPE=OVNKubernetes VM_EXTRADISKS=true VM_EXTRADISKS_LIST=vda - VM_EXTRADISKS_SIZE=1024G + VM_EXTRADISKS_SIZE=500G NUM_EXTRA_WORKERS=3 - EXTRA_WORKER_VCPU=8 - EXTRA_WORKER_MEMORY=16384 - EXTRA_WORKER_DISK=100 diff --git a/ci-operator/step-registry/hypershift/mce/agent/metal3/conformance/hypershift-mce-agent-metal3-conformance-workflow.yaml b/ci-operator/step-registry/hypershift/mce/agent/metal3/conformance/hypershift-mce-agent-metal3-conformance-workflow.yaml index dedf3105a848..49e4b192f261 100644 --- a/ci-operator/step-registry/hypershift/mce/agent/metal3/conformance/hypershift-mce-agent-metal3-conformance-workflow.yaml +++ b/ci-operator/step-registry/hypershift/mce/agent/metal3/conformance/hypershift-mce-agent-metal3-conformance-workflow.yaml @@ -28,8 +28,5 @@ workflow: NETWORK_TYPE=OVNKubernetes VM_EXTRADISKS=true VM_EXTRADISKS_LIST=vda - VM_EXTRADISKS_SIZE=1024G + VM_EXTRADISKS_SIZE=500G NUM_EXTRA_WORKERS=3 - EXTRA_WORKER_VCPU=8 - EXTRA_WORKER_MEMORY=16384 - EXTRA_WORKER_DISK=100 diff --git a/ci-operator/step-registry/hypershift/mce/install/hypershift-mce-install-commands.sh b/ci-operator/step-registry/hypershift/mce/install/hypershift-mce-install-commands.sh index e29e40d37c6f..3451810f1de5 100644 --- a/ci-operator/step-registry/hypershift/mce/install/hypershift-mce-install-commands.sh +++ b/ci-operator/step-registry/hypershift/mce/install/hypershift-mce-install-commands.sh @@ -139,6 +139,15 @@ oc patch mce multiclusterengine-sample --type=merge -p '{"spec":{"overrides":{"c echo "wait for mce to Available" oc wait --timeout=20m --for=condition=Available MultiClusterEngine/multiclusterengine-sample +oc apply -f - <