From af9aa17aeda40b3708fcbff9669562e65c7998f5 Mon Sep 17 00:00:00 2001 From: Vincent Li <30455256+vinli-cn@users.noreply.github.com> Date: Wed, 1 Jun 2022 22:03:46 +0800 Subject: [PATCH] Add secret for Long-haul (#45) --- .github/workflows/long_haul.yaml | 8 +++++--- deploy/example/azurelustre/storageclass.yaml | 2 +- .../sample-workload/deployment_write_print_file.yaml | 4 ++-- test/long-haul/start-long-haul.sh | 4 +++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/long_haul.yaml b/.github/workflows/long_haul.yaml index 91f61ab8b..c0af0c14d 100644 --- a/.github/workflows/long_haul.yaml +++ b/.github/workflows/long_haul.yaml @@ -26,6 +26,8 @@ jobs: run: | ./test/long-haul/start-long-haul.sh env: - aks_cluster_name: "aks-lustre-longhaul" - aks_resource_group: "lustre-longhaul" - aks_pool_name: "longhaul" + aks_cluster_name: ${{ secrets.AKS_LONGHAUL_CLUSTER }} + aks_resource_group: ${{ secrets.AKS_LONGHAUL_RG }} + aks_pool_name: ${{ secrets.AKS_LONGHAUL_POOL }} + lustre_fs_name: ${{ secrets.LUSTRE_FS_NAME }} + lustre_fs_ip: ${{ secrets.LUSTRE_FS_IP }} diff --git a/deploy/example/azurelustre/storageclass.yaml b/deploy/example/azurelustre/storageclass.yaml index 7684dbaba..dacee74e2 100644 --- a/deploy/example/azurelustre/storageclass.yaml +++ b/deploy/example/azurelustre/storageclass.yaml @@ -6,5 +6,5 @@ metadata: provisioner: azurelustre.csi.azure.com parameters: mgs-ip-address: "172.18.16.8" # dev1, azurelustre cluster for daily work - #mgs-ip-address: "172.18.17.8" # dev2, azurelustre cluster for long-haul and PR gated check-in + #mgs-ip-address: "172.18.17.7" # dev2, azurelustre cluster for long-haul and PR gated check-in fs-name: "lustrefs" diff --git a/test/long-haul/sample-workload/deployment_write_print_file.yaml b/test/long-haul/sample-workload/deployment_write_print_file.yaml index e0c242f8b..2118b95ab 100644 --- a/test/long-haul/sample-workload/deployment_write_print_file.yaml +++ b/test/long-haul/sample-workload/deployment_write_print_file.yaml @@ -5,8 +5,8 @@ metadata: name: azurelustre-longhaulsample-sc provisioner: azurelustre.csi.azure.com parameters: - mds-ip-address: "172.18.8.12" # 2nd azurelustre cluster for long-haul and PR gated check-in - fs-name: "lustrefs" + mds-ip-address: "{lustre_fs_ip}" # 2nd azurelustre cluster for long-haul and PR gated check-in + fs-name: "{lustre_fs_name}" --- kind: PersistentVolumeClaim diff --git a/test/long-haul/start-long-haul.sh b/test/long-haul/start-long-haul.sh index 69bec5b3c..6f334c262 100755 --- a/test/long-haul/start-long-haul.sh +++ b/test/long-haul/start-long-haul.sh @@ -24,8 +24,10 @@ source ./utils.sh export ClusterName="${aks_cluster_name}" export ResourceGroup="${aks_resource_group}" export PoolName="${aks_pool_name}" +export LustreFSName="${lustre_fs_name}" +export LustreFSIP="${lustre_fs_ip}" -sed -i "s/{longhaul_agentpool}/$PoolName/g" ./sample-workload/deployment_write_print_file.yaml +sed -i "s/{longhaul_agentpool}/$PoolName/g;s/{lustre_fs_name}/$LustreFSName/g;s/{lustre_fs_ip}/$LustreFSIP/g" ./sample-workload/deployment_write_print_file.yaml print_logs_info "Connecting to AKS Cluster=$ClusterName, ResourceGroup=$ResourceGroup, AKS pool=$PoolName" az configure --defaults group=$ResourceGroup