OCPQE-20784: Upgrade implementation Compact Hosted Control Plane (#51015

)
openshift · May 1, 2024 · 8a336a9 · 8a336a9
1 parent 2721db7
commit 8a336a9
Show file tree

Hide file tree

Showing 8 changed files with 170 additions and 5 deletions.
diff --git a/...ft-openshift-tests-private-release-4.15__amd64-nightly-4.15-upgrade-from-stable-4.14.yaml b/...ft-openshift-tests-private-release-4.15__amd64-nightly-4.15-upgrade-from-stable-4.14.yaml
@@ -330,6 +330,32 @@ tests:
     - ref: hypershift-mce-upgrade
     - chain: openshift-upgrade-qe-test-hypershift
     workflow: cucushift-installer-rehearse-baremetalds-assisted-hypershift-agent-mce-guest
+- as: baremetalds-agent-hypershift-mce-compact-full-inplace-f7
+  cluster: build05
+  cron: 46 17 5,14,21,28 * *
+  steps:
+    cluster_profile: equinix-ocp-metal-qe
+    env:
+      DEVSCRIPTS_CONFIG: |
+        IP_STACK=v4
+        NUM_WORKERS=0
+        NUM_MASTERS=3
+        MASTER_VCPU=16
+        MASTER_MEMORY=32768
+        MASTER_DISK=256
+        NETWORK_TYPE=OVNKubernetes
+        VM_EXTRADISKS=true
+        VM_EXTRADISKS_LIST=vda
+        VM_EXTRADISKS_SIZE=256G
+        NUM_EXTRA_WORKERS=2
+      EXTRA_ARGS: --node-upgrade-type=InPlace
+      LVM_OPERATOR_SUB_CHANNEL: stable-4.14
+      MCE_TARGET_VERSION: "2.5"
+      MCE_VERSION: "2.4"
+      TEST_FILTERS: ~DisconnectedOnly&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&
+    test:
+    - chain: openshift-upgrade-qe-test-hypershift-full
+    workflow: cucushift-installer-rehearse-baremetalds-assisted-hypershift-agent-mce-guest
 - as: baremetalds-ipi-ovn-ipv4-fips-f28
   cron: 8 2 5 * *
   steps:

diff --git a/...ift/openshift-tests-private/openshift-openshift-tests-private-release-4.15-periodics.yaml b/...ift/openshift-tests-private/openshift-openshift-tests-private-release-4.15-periodics.yaml
@@ -1937,6 +1937,94 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build05
+  cron: 46 17 5,14,21,28 * *
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: release-4.15
+    org: openshift
+    repo: openshift-tests-private
+  labels:
+    ci-operator.openshift.io/cloud: equinix-ocp-metal
+    ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal-qe
+    ci-operator.openshift.io/cluster: build05
+    ci-operator.openshift.io/variant: amd64-nightly-4.15-upgrade-from-stable-4.14
+    ci.openshift.io/generator: prowgen
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-4.15-upgrade-from-stable-4.14-baremetalds-agent-hypershift-mce-compact-full-inplace-f7
+  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
+      - --oauth-token-path=/usr/local/github-credentials/oauth
+      - --report-credentials-file=/etc/report/credentials
+      - --secret-dir=/secrets/ci-pull-credentials
+      - --secret-dir=/usr/local/baremetalds-agent-hypershift-mce-compact-full-inplace-f7-cluster-profile
+      - --target=baremetalds-agent-hypershift-mce-compact-full-inplace-f7
+      - --variant=amd64-nightly-4.15-upgrade-from-stable-4.14
+      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/baremetalds-agent-hypershift-mce-compact-full-inplace-f7-cluster-profile
+        name: cluster-profile
+      - mountPath: /secrets/gcs
+        name: gcs-credentials
+        readOnly: true
+      - mountPath: /usr/local/github-credentials
+        name: github-credentials-openshift-ci-robot-private-git-cloner
+        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-qe
+    - name: github-credentials-openshift-ci-robot-private-git-cloner
+      secret:
+        secretName: github-credentials-openshift-ci-robot-private-git-cloner
+    - 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: build05
   cron: 13 1 5,12,21,28 * *

diff --git a/...ucushift-installer-rehearse-baremetalds-assisted-hypershift-agent-mce-guest-workflow.yaml b/...ucushift-installer-rehearse-baremetalds-assisted-hypershift-agent-mce-guest-workflow.yaml
@@ -17,10 +17,7 @@ workflow:
         NETWORK_TYPE=OVNKubernetes
         VM_EXTRADISKS=true
         VM_EXTRADISKS_LIST=vda
-        VM_EXTRADISKS_SIZE=1024G
+        VM_EXTRADISKS_SIZE=256G
         NUM_EXTRA_WORKERS=3
-        EXTRA_WORKER_VCPU=8
-        EXTRA_WORKER_MEMORY=16384
-        EXTRA_WORKER_DISK=100
   documentation: |-
     This is the workflow to trigger Prow's rehearsal test when submitting installer steps/chain/workflow
diff --git a/ci-operator/step-registry/cucushift/upgrade/toimage/cucushift-upgrade-toimage-commands.sh b/ci-operator/step-registry/cucushift/upgrade/toimage/cucushift-upgrade-toimage-commands.sh
@@ -531,6 +531,11 @@ if [[ -f "${SHARED_DIR}/kubeconfig" ]] ; then
     export KUBECONFIG=${SHARED_DIR}/kubeconfig
 fi
 
+#support HyperShift upgrade
+if [[ -f "${SHARED_DIR}/mgmt_kubeconfig" ]]; then
+    export KUBECONFIG="${SHARED_DIR}/mgmt_kubeconfig"
+fi
+
 # Setup proxy if it's present in the shared dir
 if [[ -f "${SHARED_DIR}/proxy-conf.sh" ]]; then
     # shellcheck disable=SC1091

diff --git a/ci-operator/step-registry/hypershift/mce/upgrade/hypershift-mce-upgrade-commands.sh b/ci-operator/step-registry/hypershift/mce/upgrade/hypershift-mce-upgrade-commands.sh
@@ -66,6 +66,11 @@ until oc get multiclusterengines multiclusterengine-sample -ojsonpath="{.status.
   sleep 10
 done
 oc wait --timeout=20m pod -n multicluster-engine --all --for=condition=Ready
+echo "multiclusterengine upgrade successfully"
+until [[ $(oc get deployment -n hypershift operator -o jsonpath='{.status.updatedReplicas}') == $(oc get deployment -n hypershift operator -o jsonpath='{.status.replicas}') ]]; do
+    echo "Waiting for updated replicas to match replicas..."
+    sleep 10
+done
 oc wait --timeout=5m --for=condition=Available -n local-cluster ManagedClusterAddOn/hypershift-addon
 oc wait --timeout=5m --for=condition=Degraded=False -n local-cluster ManagedClusterAddOn/hypershift-addon
-echo "multiclusterengine upgrade successfully"
+echo "HyperShift operator upgrade successfully"
diff --git a/ci-operator/step-registry/openshift/upgrade/qe/test/hypershift/full/OWNERS b/ci-operator/step-registry/openshift/upgrade/qe/test/hypershift/full/OWNERS
@@ -0,0 +1,9 @@
+approvers:
+- jhou1
+- liangxia
+- jianzhangbjz
+- kuiwang02
+- jiajliu
+- shellyyang1989
+- aleskandro
+- LiangquanLi930
diff --git a/...ade/qe/test/hypershift/full/openshift-upgrade-qe-test-hypershift-full-chain.metadata.json b/...ade/qe/test/hypershift/full/openshift-upgrade-qe-test-hypershift-full-chain.metadata.json
@@ -0,0 +1,15 @@
+{
+	"path": "openshift/upgrade/qe/test/hypershift/full/openshift-upgrade-qe-test-hypershift-full-chain.yaml",
+	"owners": {
+		"approvers": [
+			"jhou1",
+			"liangxia",
+			"jianzhangbjz",
+			"kuiwang02",
+			"jiajliu",
+			"shellyyang1989",
+			"aleskandro",
+			"LiangquanLi930"
+		]
+	}
+}
diff --git a/...hift/upgrade/qe/test/hypershift/full/openshift-upgrade-qe-test-hypershift-full-chain.yaml b/...hift/upgrade/qe/test/hypershift/full/openshift-upgrade-qe-test-hypershift-full-chain.yaml
@@ -0,0 +1,20 @@
+chain:
+  as: openshift-upgrade-qe-test-hypershift-full
+  steps:
+  - ref: cucushift-pre
+  - ref: openshift-extended-upgrade-pre
+  - ref: cucushift-upgrade-prepare
+  - ref: cucushift-upgrade-toimage
+  - ref: hypershift-mce-upgrade
+  - ref: cucushift-upgrade-hypershift-control-plane-toimage
+  - ref: cucushift-upgrade-hypershift-worker-node-toimage
+  - ref: openshift-extended-upgrade-post
+  - ref: cucushift-upgrade-check
+  - ref: openshift-upgrade-qe-test-report
+  documentation: |-
+    The chain executes upgrade-prepare, which creates test data on the cluster;
+    then upgrade the mgmt cluster
+    then upgrade the multiclusterengines
+    then upgrade the HyperShift HostedCluster(CP);
+    then upgrade the HyperShift NodePool(worker node);
+    then execute upgrade-check, which checks the prepared test data.