clean up, and updated smoke tests for validation

microsoft · Apr 14, 2020 · 8fa3ad2 · 8fa3ad2
1 parent b43a650
commit 8fa3ad2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/src/lib/fileutils.ts b/src/lib/fileutils.ts
@@ -228,13 +228,7 @@ export const serviceBuildAndUpdatePipeline = (
                   `echo "Image Name: $IMAGE_NAME"`,
                   `ACR_BUILD_BASE_COMMAND=("az acr build -r $(ACR_NAME) --image $IMAGE_NAME .")`,
                   `if [ -z "\${serviceBuildVariables}" ]; then echo "No build arguments found."; else SERVICE_BUILD_VARIABLES=$(echo \${serviceBuildVariables} | tr "," " " ) ; VARIABLES_ARRAY=(echo \${SERVICE_BUILD_VARIABLES}) ; for i in \${VARIABLES_ARRAY[@]}; do export $i=\${i} ; ACR_BUILD_BASE_COMMAND+=" --build-arg $i=\${i}" ; done ; fi`,
-                  //`SERVICE_BUILD_VARIABLES=$(echo ${serviceBuildVariables} | tr "," " " )`,
-                  //`echo "Service Variables: $SERVICE_BUILD_VARIABLES`,
-                  //`VARIABLES_ARRAY=(echo $SERVICE_BUILD_VARIABLES)`,
-                  //`for i in \${VARIABLES_ARRAY[@]}; do export $i=\${i} ; ACR_BUILD_BASE_COMMAND+=" --build-arg $i=\${i}" ; done`,
                   `cd ${relativeServiceForDockerfile}`,
-                  //`echo "az acr build -r $(ACR_NAME) --image $IMAGE_NAME ."`,
-                  //`az acr build -r $(ACR_NAME) --image $IMAGE_NAME .`,
                   `echo "ACR BUILD COMMAND: $ACR_BUILD_BASE_COMMAND"`,
                   `\${ACR_BUILD_BASE_COMMAND[@]}`,
                 ]),

diff --git a/src/test/mockFactory.ts b/src/test/mockFactory.ts
@@ -101,13 +101,7 @@ export const createTestServiceBuildAndUpdatePipelineYaml = (
                   `echo "Image Name: $IMAGE_NAME"`,
                   `ACR_BUILD_BASE_COMMAND=("az acr build -r $(ACR_NAME) --image $IMAGE_NAME .")`,
                   `if [ -z "\${serviceBuildVariables}" ]; then echo "No build arguments found."; else SERVICE_BUILD_VARIABLES=$(echo \${serviceBuildVariables} | tr "," " " ) ; VARIABLES_ARRAY=(echo \${SERVICE_BUILD_VARIABLES}) ; for i in \${VARIABLES_ARRAY[@]}; do export $i=\${i} ; ACR_BUILD_BASE_COMMAND+=" --build-arg $i=\${i}" ; done ; fi`,
-                  //`SERVICE_BUILD_VARIABLES=$(echo \${serviceBuildVariables} | tr "," " " )`,
-                  //`echo "Service Variables: $SERVICE_BUILD_VARIABLES`,
-                  //`VARIABLES_ARRAY=(echo $SERVICE_BUILD_VARIABLES)`,
-                  //`for i in \${VARIABLES_ARRAY[@]}; do export $i=\${i} ; ACR_BUILD_BASE_COMMAND+=" --build-arg $i=\${i}" ; done`,
                   `cd ${relativeServiceForDockerfile}`,
-                  //`echo "az acr build -r $(ACR_NAME) --image $IMAGE_NAME ."`,
-                  //`az acr build -r $(ACR_NAME) --image $IMAGE_NAME .`,
                   `echo "ACR BUILD COMMAND: $ACR_BUILD_BASE_COMMAND"`,
                   `\${ACR_BUILD_BASE_COMMAND[@]}`,
                 ]),

diff --git a/tests/validations.sh b/tests/validations.sh
@@ -225,7 +225,7 @@ cd "$TEST_WORKSPACE/$mono_repo_dir"
 
 # helm_repo_url="$AZDO_ORG_URL/$AZDO_PROJECT/_git/$helm_charts_dir"
 local_repo_url="$AZDO_ORG_URL/$AZDO_PROJECT/_git/$mono_repo_dir"
-spk service create $FrontEnd $FrontEnd -d $services_dir -p "chart" -g $local_repo_url -b master >> $TEST_WORKSPACE/log.txt
+spk service create $FrontEnd $FrontEnd -d $services_dir -p "chart" -g $local_repo_url -b master --service-build-vg ydawgie-vg --service-build-variables dawgie >> $TEST_WORKSPACE/log.txt
 # spk service create $FrontEnd $FrontEnd -d $services_dir -p "$FrontEnd/chart" -g $helm_repo_url -b master >> $TEST_WORKSPACE/log.txt
 directory_to_check="$services_full_dir/$FrontEnd"
 file_we_expect=(".gitignore" "build-update-hld.yaml" "Dockerfile" )