Avoid explicitly linking the management cluster

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
openshift · Feb 7, 2024 · 601630b · 601630b
1 parent 5208449
commit 601630b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...rshift/kubevirt/install/disconnected/hypershift-kubevirt-install-disconnected-commands.sh b/...rshift/kubevirt/install/disconnected/hypershift-kubevirt-install-disconnected-commands.sh
@@ -126,6 +126,9 @@ mirror:
 END
 
 pushd /home
+# try at least 3 times to be sure to get all the images...
+/home/oc-mirror --config "/home/imageset-config.yaml" docker://\${mirror_registry} --oci-registries-config="/home/registry.conf" --continue-on-error --skip-missing
+/home/oc-mirror --config "/home/imageset-config.yaml" docker://\${mirror_registry} --oci-registries-config="/home/registry.conf" --continue-on-error --skip-missing
 /home/oc-mirror --config "/home/imageset-config.yaml" docker://\${mirror_registry} --oci-registries-config="/home/registry.conf" --continue-on-error --skip-missing
 popd
 

diff --git a/...ed/conformance/hypershift-mce-kubevirt-baremetalds-disconnected-conformance-workflow.yaml b/...ed/conformance/hypershift-mce-kubevirt-baremetalds-disconnected-conformance-workflow.yaml
@@ -23,6 +23,7 @@ workflow:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
     post:
+    - ref: wait       # TODO: remove me!
     - ref: hypershift-mce-dump
     - chain: gather-core-dump
     - chain: hypershift-mce-kubevirt-destroy

diff --git a/...t/mce/kubevirt/create/disconnected/hypershift-mce-kubevirt-create-disconnected-chain.yaml b/...t/mce/kubevirt/create/disconnected/hypershift-mce-kubevirt-create-disconnected-chain.yaml
@@ -122,6 +122,7 @@ chain:
           --pull-secret \${PULL_SECRET_PATH} \
           --generate-ssh
 
+        # TODO: why do we need this? can we skip this?
         oc annotate hostedclusters -n local-cluster \${CLUSTER_NAME} "cluster.open-cluster-management.io/managedcluster-name=\${CLUSTER_NAME}" --overwrite
         oc apply -f - <<EOF2
         apiVersion: cluster.open-cluster-management.io/v1
@@ -141,6 +142,7 @@ chain:
           hubAcceptsClient: true
           leaseDurationSeconds: 60
         EOF2
+        ####
 
         echo "Waiting for cluster to become available"
         oc wait --timeout=30m --for=condition=Available --namespace=local-cluster hostedcluster/\${CLUSTER_NAME}
@@ -151,10 +153,6 @@ chain:
 
         scp "${SSHOPTS[@]}" "root@${IP}:/home/nested_kubeconfig" "${SHARED_DIR}/nested_kubeconfig"
 
-        if [ "$(oc get infrastructure cluster -o=jsonpath='{.status.platformStatus.type}')" == "BareMetal" ]; then
-          exit 0
-        fi 
-
         echo "Waiting for nested cluster's node count to reach the desired replicas count in the NodePool"
         until \
           [[ $(oc get nodepool ${CLUSTER_NAME} -n local-cluster -o jsonpath='{.spec.replicas}') \