compact cluster test

openshift · May 1, 2024 · be5139f · be5139f
1 parent 8a336a9
commit be5139f
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 86 deletions.
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
@@ -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
@@ -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: build02
   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: build02
   cron: 0 4 * * *

diff --git a/...hift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh b/...hift/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/...erator/step-registry/hypershift/mce/agent/destroy/hypershift-mce-agent-destroy-chain.yaml b/...erator/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/...d/create/hostedcluster/hypershift-mce-agent-disconnected-create-hostedcluster-commands.sh b/...d/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/...rshift/mce/agent/metal3/conformance/hypershift-mce-agent-metal3-conformance-workflow.yaml b/...rshift/mce/agent/metal3/conformance/hypershift-mce-agent-metal3-conformance-workflow.yaml
@@ -8,6 +8,7 @@ workflow:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
     post:
+    - ref: wait
     - chain: hypershift-mce-agent-destroy
     - chain: baremetalds-ofcir-post
     test: