Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Test]Optimize the generation method of rocky-kubeanclusterops #1413

Merged
merged 1 commit into from
Nov 21, 2024
Merged

[Test]Optimize the generation method of rocky-kubeanclusterops #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion hack/offline_run_centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ export OS_NAME="ROCKY8"
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-rocky.yml ${REPO_ROOT}/test/kubean_functions_e2e/e2e-install-cluster/kubeanClusterOps.yml
cp -f ${REPO_ROOT}/test/offline-common/kubeanClusterOps.yml ${REPO_ROOT}/test/kubean_functions_e2e/e2e-install-cluster/kubeanClusterOps.yml
minio_url=" -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']}\""
sed -i "s|.*repo_list.*|${minio_url}|" ${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}
Expand Down
6 changes: 3 additions & 3 deletions hack/run-network-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ function func_prepare_config_yaml_single_stack() {
cp -f "${source_path}"/hosts-conf-cm-2nodes.yml "${dest_path}"/hosts-conf-cm.yml
cp -f "${source_path}"/vars-conf-cm.yml "${dest_path}"
cp -f "${source_path}"/kubeanCluster.yml "${dest_path}"
cp -f "${source_path}"/kubeanClusterOps.yml "${dest_path}"
if [[ "${os_name}" = "ROCKY8" ]]; then
cp -f "${source_path}"/kubeanClusterOps-rocky.yml "${dest_path}"
else
cp -f "${source_path}"/kubeanClusterOps.yml "${dest_path}"
minio_url=" -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']}\""
sed -i "s|.*repo_list.*|${minio_url}|" "${dest_path}"/kubeanClusterOps.yml
fi

cp -f "${source_path}"/kubeanClusterOps.yml "${dest_path}"
Expand Down
Loading