resolving comments

ABFSDriver · Dec 27, 2024 · 00f5e74 · 00f5e74
1 parent bfe34e1
commit 00f5e74
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 50 deletions.
diff --git a/hadoop-tools/hadoop-azure/.gitignore b/hadoop-tools/hadoop-azure/.gitignore
@@ -5,3 +5,4 @@ src/test/resources/abfs-combination-test-configs.xml
 dev-support/testlogs
 src/test/resources/accountSettings/*
 !src/test/resources/accountSettings/accountName_settings.xml.template
+dev-support/testrun-scripts/cronjob.sh
diff --git a/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/cronjob.sh b/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/cronjob.sh
diff --git a/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/runtests.sh b/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/runtests.sh
@@ -121,15 +121,15 @@ cleanUpTestContainers=false
 if [ "$IS_CRON_JOB" = "true" ]; then
   runTest=true
   runHNSOAuthDFSTest
-  runHNSSharedKeyDFSTest
-  runNonHNSSharedKeyDFSTest
-  runAppendBlobHNSOAuthDFSTest
-  runNonHNSSharedKeyBlobTest
-  runNonHNSOAuthDFSTest
-  runNonHNSOAuthBlobTest
-  runAppendBlobNonHNSOAuthBlobTest
-  runHNSOAuthDFSIngressBlobTest
-  runNonHNSOAuthDFSIngressBlobTest
+#  runHNSSharedKeyDFSTest
+#  runNonHNSSharedKeyDFSTest
+#  runAppendBlobHNSOAuthDFSTest
+#  runNonHNSSharedKeyBlobTest
+#  runNonHNSOAuthDFSTest
+#  runNonHNSOAuthBlobTest
+#  runAppendBlobNonHNSOAuthBlobTest
+#  runHNSOAuthDFSIngressBlobTest
+#  runNonHNSOAuthDFSIngressBlobTest
   uploadToAzure
 else
 
@@ -267,7 +267,7 @@ do
   done
 fi
 
-if [[ $runTest == true && $"$IS_CRON_JOB" != "true" ]]
+if [[ $runTest && $"$IS_CRON_JOB" != "true" ]]
 then
   printAggregate
 fi
diff --git a/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/testsupport.sh b/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/testsupport.sh
@@ -45,8 +45,8 @@ ENDTIME=$(date +%s)
 outputFormatOn="\033[0;95m"
 outputFormatOff="\033[0m"
 
-targetWord="dfs"
-replacementWord="blob"
+targetWord=".dfs."
+replacementWord=".blob."
 accountSettingsDir="src/test/resources/accountSettings/"
 accountConfigFileSuffix="_settings.xml"
 
@@ -64,15 +64,16 @@ fnsBlobConfigFileCheck() {
   fi
 }
 
-if ! command -v az &> /dev/null
-then
-  echo "Azure CLI (az) could not be found. Installing Azure CLI..."
-  if ! sudo apt update || ! sudo apt install -y azure-cli; then
-    echo "Failed to install Azure CLI. Exiting..."
-    exit 1
+checkCronjobDependencies() {
+  if ! [ "$(command -v az)" ]; then
+    echo "Azure CLI (az) could not be found. Installing Azure CLI..."
+    if ! sudo apt update || ! sudo apt install -y azure-cli; then
+      echo "Failed to install Azure CLI. Exiting..."
+      exit 1
+    fi
+    echo "Azure CLI installed successfully."
   fi
-  echo "Azure CLI installed successfully."
-fi
+}
 
 uploadToAzure() {
   azureConfigFilePath="${accountSettingsDir}runresult${accountConfigFileSuffix}"
@@ -89,6 +90,7 @@ uploadToAzure() {
   directoryStructure="$year-$month-$day/$branchName"
   AggregatedTestFolder="$testOutputLogFolder"
 
+  checkCronjobDependencies
   az storage container create --name $containerName --account-name $testResultsAccountName --account-key "$testResultsAccountKey"
   az storage blob upload-batch --destination "$containerName/$directoryStructure" --source $AggregatedTestFolder --account-name $testResultsAccountName --account-key "$testResultsAccountKey"