diff --git a/pipelines/utilities/install_backupstores.sh b/pipelines/utilities/install_backupstores.sh index 3355931f7..0a78e8cb9 100755 --- a/pipelines/utilities/install_backupstores.sh +++ b/pipelines/utilities/install_backupstores.sh @@ -7,10 +7,10 @@ install_backupstores(){ -f ${NFS_BACKUPSTORE_URL} \ -f ${CIFS_BACKUPSTORE_URL} \ -f ${AZURITE_BACKUPSTORE_URL} - setup_azuitize_backup_store + setup_azurite_backup_store } -setup_azuitize_backup_store(){ +setup_azurite_backup_store(){ RETRY=0 MAX_RETRY=60 until (kubectl get pods | grep 'longhorn-test-azblob' | grep 'Running'); do diff --git a/test_framework/scripts/longhorn-setup.sh b/test_framework/scripts/longhorn-setup.sh index 66d79baa5..f83f85cd9 100755 --- a/test_framework/scripts/longhorn-setup.sh +++ b/test_framework/scripts/longhorn-setup.sh @@ -341,10 +341,22 @@ install_backupstores(){ -f ${NFS_BACKUPSTORE_URL} \ -f ${CIFS_BACKUPSTORE_URL} \ -f ${AZURITE_BACKUPSTORE_URL} - setup_azuitize_backup_store + setup_azurite_backup_store } -setup_azuitize_backup_store(){ +install_backupstores_from_lh_repo(){ + MINIO_BACKUPSTORE_URL="https://raw.githubusercontent.com/longhorn/longhorn/master/deploy/backupstores/minio-backupstore.yaml" + NFS_BACKUPSTORE_URL="https://raw.githubusercontent.com/longhorn/longhorn/master/deploy/backupstores/nfs-backupstore.yaml" + CIFS_BACKUPSTORE_URL="https://raw.githubusercontent.com/longhorn/longhorn/master/deploy/backupstores/cifs-backupstore.yaml" + AZURITE_BACKUPSTORE_URL="https://raw.githubusercontent.com/longhorn/longhorn/master/deploy/backupstores/azurite-backupstore.yaml" + kubectl create -f ${MINIO_BACKUPSTORE_URL} \ + -f ${NFS_BACKUPSTORE_URL} \ + -f ${CIFS_BACKUPSTORE_URL} \ + -f ${AZURITE_BACKUPSTORE_URL} + setup_azurite_backup_store +} + +setup_azurite_backup_store(){ RETRY=0 MAX_RETRY=60 until (kubectl get pods | grep 'longhorn-test-azblob' | grep 'Running'); do @@ -557,7 +569,11 @@ main(){ install_cluster_autoscaler fi if [[ ${PYTEST_CUSTOM_OPTIONS} != *"--include-cluster-autoscaler-test"* ]]; then - install_backupstores + if [[ "${TF_VAR_k8s_distro_name}" == "eks" || "${TF_VAR_k8s_distro_name}" == "aks" ]]; then + install_backupstores_from_lh_repo + else + install_backupstores + fi fi install_csi_snapshotter_crds if [[ "${TF_VAR_enable_mtls}" == true ]]; then