adding BUILD_TYPE condition

Author: pulimsr

tools/scripts/build-tests/run-al2-integ-tests.sh

@@ -11,18 +11,19 @@
 
 set -e
 
-if [ "$#" -ne 3 ]; then
-  echo "Usage: ${0} PREFIX_DIR AWS_ACCOUNT ROLE_SESSION_NAME"
+if [ "$#" -ne 4 ]; then
+  echo "Usage: ${0} PREFIX_DIR AWS_ACCOUNT ROLE_SESSION_NAME BUILD_TYPE"
   exit 1
 fi
 PREFIX_DIR="$1"
 AWS_ACCOUNT="$2"
 AWS_ROLE_SESSION_NAME="$3"
+BUILD_TYPE="$4"
 
 echo "Setting the run environment"
 export TEST_ASSUME_ROLE_ARN=arn:aws:iam::${AWS_ACCOUNT}:role/IntegrationTest
-pushd cd ${PREFIX_DIR}/aws-sdk-cpp
-SERVICE_ID=$(git status generated/src/aws-cpp-sdk-* --porcelain | grep "generated/src/" | sed -n 's|.*generated/src/aws-cpp-sdk-\([^/]*\).*|\1|p' | sort -u | tr "\n" "," | sed "s/,$//")
+pushd ${PREFIX_DIR}/aws-sdk-cpp
+if [ "${BUILD_TYPE}" = "PREVIEW" ]; then SERVICE_ID=$(git status generated/src/aws-cpp-sdk-* --porcelain | grep "generated/src/" | sed -n 's|.*generated/src/aws-cpp-sdk-\([^/]*\).*|\1|p' | sort -u | tr "\n" "," | sed "s/,$//"); else SERVICE_ID=""; fi
 popd
 echo "SERVICE_ID=${SERVICE_ID}"
 export TEST_LAMBDA_CODE_PATH=${PREFIX_DIR}/aws-sdk-cpp/tests/aws-cpp-sdk-lambda-integration-tests/resources

tools/scripts/build-tests/run-mac-integ-tests.sh

@@ -11,18 +11,19 @@
 
 set -e
 
-if [ "$#" -ne 3 ]; then
-  echo "Usage: ${0} PREFIX_DIR AWS_ACCOUNT ROLE_SESSION_NAME"
+if [ "$#" -ne 4 ]; then
+  echo "Usage: ${0} PREFIX_DIR AWS_ACCOUNT ROLE_SESSION_NAME BUILD_TYPE"
   exit 1
 fi
 PREFIX_DIR="$1"
 AWS_ACCOUNT="$2"
 AWS_ROLE_SESSION_NAME="$3"
+BUILD_TYPE="$4"
 
 echo "Setting the run environment"
 export TEST_ASSUME_ROLE_ARN=arn:aws:iam::${AWS_ACCOUNT}:role/IntegrationTest
-pushd cd ${PREFIX_DIR}/aws-sdk-cpp
-SERVICE_ID=$(git status generated/src/aws-cpp-sdk-* --porcelain | grep "generated/src/" | sed -n 's|.*generated/src/aws-cpp-sdk-\([^/]*\).*|\1|p' | sort -u | tr "\n" "," | sed "s/,$//")
+pushd ${PREFIX_DIR}/aws-sdk-cpp
+if [ "${BUILD_TYPE}" = "PREVIEW" ]; then SERVICE_ID=$(git status generated/src/aws-cpp-sdk-* --porcelain | grep "generated/src/" | sed -n 's|.*generated/src/aws-cpp-sdk-\([^/]*\).*|\1|p' | sort -u | tr "\n" "," | sed "s/,$//"); else SERVICE_ID=""; fi
 popd
 echo "Service ID: ${SERVICE_ID}"
 export TEST_LAMBDA_CODE_PATH=${PREFIX_DIR}/aws-sdk-cpp/tests/aws-cpp-sdk-lambda-integration-tests/resources

tools/scripts/build-tests/run-windows-integ-tests.ps1

@@ -17,10 +17,12 @@ aws configure set aws_access_key_id (${sts}[1] -replace " " -replace "`"" -repla
 aws configure set aws_secret_access_key (${sts}[2] -replace " " -replace "`"" -replace ",")
 aws configure set aws_session_token (${sts}[3] -replace " " -replace "`"" -replace ",")
 aws configure list
-pushd cd "${env:PREFIX_DIR}/aws-sdk-cpp"
-$SERVICE_ID = (git status generated/src/aws-cpp-sdk-* --porcelain | Select-String "generated/src/" | ForEach-Object { if($_ -match "generated/src/aws-cpp-sdk-([^/]*)") { $matches[1] } } | Sort-Object -Unique) -join ","
-popd
-echo "Service ID: $SERVICE_ID"
+$BUILD_TYPE=$(cat build-request.json | jq .buildType | tr -d \\)
+Write-Host BUILD_TYPE:$BUILD_TYPE
+Push-Location "${env:CATAPULT_WORKSPACE_DIR}\\aws-sdk-cpp"
+if ($BUILD_TYPE -eq "PREVIEW") { $SERVICE_ID = (git status generated/src/aws-cpp-sdk-* --porcelain | Select-String "generated/src/" | ForEach-Object { if($_ -match "generated/src/aws-cpp-sdk-([^/]*)") { $matches[1] } } | Sort-Object -Unique) -join "," } else { $SERVICE_ID="" }
+Write-Host "SERVICE_ID: $SERVICE_ID"
+Pop-Location
 # Run tests
 cd "${env:PREFIX_DIR}\\win-build"
 if ($SERVICE_ID) { & python ../aws-sdk-cpp/tools/scripts/run_integration_tests.py --testDir ./bin/Debug --serviceId $SERVICE_ID } else { & python ../aws-sdk-cpp/tools/scripts/run_integration_tests.py --testDir ./bin/Debug }