Merge pull request #1379 from FloatXD/up-e2e-16

[Test]update offline_e2e kubeanClusterOps.yml
kubean-io · Oct 15, 2024 · 92bbb00 · 92bbb00
2 parents 28c4fd2 + e9ff771
commit 92bbb00
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/hack/offline_run_centos.sh b/hack/offline_run_centos.sh
@@ -15,7 +15,7 @@ export OS_NAME="CENTOS7"
 CLUSTER_OPERATION_NAME1="cluster1-install-"`date "+%H-%M-%S"`
 cp -f  ${REPO_ROOT}/test/offline-common/hosts-conf-cm.yml ${REPO_ROOT}/test/kubean_functions_e2e/e2e-install-cluster/
 cp -f  ${REPO_ROOT}/test/offline-common/kubeanCluster.yml ${REPO_ROOT}/test/kubean_functions_e2e/e2e-install-cluster/
-cp -f  ${REPO_ROOT}/test/offline-common/kubeanClusterOps.yml ${REPO_ROOT}/test/kubean_functions_e2e/e2e-install-cluster/
+cp -f  ${REPO_ROOT}/test/offline-common/kubeanClusterOps-rocky.yml ${REPO_ROOT}/test/kubean_functions_e2e/e2e-install-cluster/kubeanClusterOps.yml
 cp -f  ${REPO_ROOT}/test/offline-common/vars-conf-cm.yml ${REPO_ROOT}/test/kubean_functions_e2e/e2e-install-cluster/
 
 util::vm_name_ip_init_offline_by_os ${OS_NAME}

diff --git a/test/offline-common/kubeanClusterOps-rocky.yml b/test/offline-common/kubeanClusterOps-rocky.yml
@@ -0,0 +1,35 @@
+apiVersion: kubean.io/v1alpha1
+kind: ClusterOperation
+metadata:
+  name: e2e-cluster1-install
+  labels:
+    clusterName: cluster1
+spec:
+  cluster: cluster1
+  image:
+  actionType: playbook
+  action: cluster.yml
+  preHook:
+    - actionType: playbook
+      action: ping.yml
+
+    - actionType: playbook
+      action: enable-repo.yml
+      extraArgs: |
+        -e "{repo_list: ['{offline_minio_url}/kubean/rocky/\$releasever/os/\$basearch','{offline_minio_url}/kubean/rocky-iso/\$releasever/os/\$basearch/BaseOS','{offline_minio_url}/kubean/rocky-iso/\$releasever/os/\$basearch/AppStream']}"
+
+    - actionType: playbook
+      action: disable-firewalld.yml
+
+    - actionType: playbook
+      action: remove-pkgs.yml
+
+    - actionType: shell
+      action: |-
+        sed -i 's/maxUnavailable: 0/maxUnavailable: 1/' /kubespray/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
+
+  postHook:
+    - actionType: playbook
+      action: kubeconfig.yml
+    - actionType: playbook
+      action: cluster-info.yml
diff --git a/test/offline-common/kubeanClusterOps.yml b/test/offline-common/kubeanClusterOps.yml
@@ -16,7 +16,7 @@ spec:
     - actionType: playbook
       action: enable-repo.yml
       extraArgs: |
-        -e "{repo_list: ['{offline_minio_url}/kubean/rocky/\$releasever/os/\$basearch','{offline_minio_url}/kubean/rocky-iso/\$releasever/os/\$basearch/BaseOS','{offline_minio_url}/kubean/rocky-iso/\$releasever/os/\$basearch/AppStream']}"
+        -e "{repo_list: ['{offline_minio_url}/kubean/rocky/\$releasever/os/\$basearch','{offline_minio_url}/kubean/rocky-iso/\$releasever/os/\$basearch']}"
 
     - actionType: playbook
       action: disable-firewalld.yml