update gcp deployment scripts

provider/indexer-gcp/scripts/deploy.sh

@@ -29,7 +29,7 @@ mkdir -p $DEPLOY_SCRIPTS_DIR
 echo "Copy artifacts to folder: $DEPLOY_DIR"
 cp $DROP_DIR/app.yaml $DEPLOY_DIR
 cp $DROP_DIR/indexer-gcp-*.jar  $DEPLOY_DIR
-# cp $DROP_DIR/testing.zip  $DEPLOY_DIR
+cp $DROP_DIR/testing.zip  $DEPLOY_DIR
 cp $DROP_DIR/scripts/* $DEPLOY_SCRIPTS_DIR
 chmod a+x $DEPLOY_SCRIPTS_DIR/*.sh
 

provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl

@@ -50,35 +50,30 @@ fi
 echo "Current version = $CURRENT_VERSION"
 echo "Version to be deployed = $VERSION_NUMBER"
 
-if [ "$VERSION_NUMBER" != "$CURRENT_VERSION" -o "$BUILD_FORCE_DEPLOY" = "true" -o "$BUILD_FORCE_DEPLOY" = "True" -o "$BUILD_FORCE_DEPLOY" = "TRUE" ]
+if [ "$VERSION_NUMBER" != "$CURRENT_VERSION" -o "$BUILD_FORCE_DEPLOY" = "true" ]
 then
-    if [ "$BUILD_SOURCEBRANCHNAME" = "master" -o "$BUILD_FORCE_DEPLOY" = "true" -o "$BUILD_FORCE_DEPLOY" = "True" -o "$BUILD_FORCE_DEPLOY" = "TRUE" ]
+    SERVICE_NAME="indexer-service"
+    # If the version $VERSION_NUMBER already exists, but not serving traffic, gcloud app deploy will fail. In this case, simply start that version and migrate traffic to it
+    doesVersionExist=`gcloud app versions list --service=$SERVICE_NAME --project=$PROJECT_ID | grep $VERSION_NUMBER | wc -l`
+    if [ "$doesVersionExist" -eq "1" ]
     then
-        SERVICE_NAME="indexer-service"
-        # If the version $VERSION_NUMBER already exists, but not serving traffic, gcloud app deploy will fail. In this case, simply start that version and migrate traffic to it
-        doesVersionExist=`gcloud app versions list --service=$SERVICE_NAME --project=$PROJECT_ID | grep $VERSION_NUMBER | wc -l`
-        if [ "$doesVersionExist" -eq "1" ]
-        then
-            echo "Starting version $VERSION_NUMBER"
-            gcloud app versions start $VERSION_NUMBER --service=$SERVICE_NAME --project=$PROJECT_ID --quiet
-            echo "Migrating all traffic to version $VERSION_NUMBER"
-            gcloud app services set-traffic $SERVICE_NAME --splits $VERSION_NUMBER=1 --project=$PROJECT_ID --quiet
-        else
-            export INDEXER_HOSTNAME="indexer-service-dot-$PROJECT_ID.appspot.com"
-
-            echo "Replacing GOOGLE_CLOUD_PROJECT_PLACE_HOLDER with $PROJECT_ID"
-            sed -i "s|GOOGLE_CLOUD_PROJECT_PLACE_HOLDER|$PROJECT_ID|g" app.yaml
-
-            echo "Content of app.yaml:"
-            cat app.yaml
-
-            echo "Deploying $INDEXER_HOSTNAME service"
-            gcloud app deploy --project=$PROJECT_ID --version=$VERSION_NUMBER app.yaml
-            echo "$INDEXER_HOSTNAME service deployed successfully"
-
-        fi
+        echo "Starting version $VERSION_NUMBER"
+        gcloud app versions start $VERSION_NUMBER --service=$SERVICE_NAME --project=$PROJECT_ID --quiet
+        echo "Migrating all traffic to version $VERSION_NUMBER"
+        gcloud app services set-traffic $SERVICE_NAME --splits $VERSION_NUMBER=1 --project=$PROJECT_ID --quiet
     else
-        echo "Not deploying the application because build source branch was not master"
+        export INDEXER_HOSTNAME="indexer-service-dot-$PROJECT_ID.appspot.com"
+
+        echo "Replacing GOOGLE_CLOUD_PROJECT_PLACE_HOLDER with $PROJECT_ID"
+        sed -i "s|GOOGLE_CLOUD_PROJECT_PLACE_HOLDER|$PROJECT_ID|g" app.yaml
+
+        echo "Content of app.yaml:"
+        cat app.yaml
+
+        echo "Deploying $INDEXER_HOSTNAME service"
+        gcloud app deploy --project=$PROJECT_ID --version=$VERSION_NUMBER app.yaml
+        echo "$INDEXER_HOSTNAME service deployed successfully"
+
     fi
 else
     echo "Not deploying the application because $VERSION_NUMBER is already deployed and force deploy flag is not set to true"

provider/indexer-gcp/scripts/stage-artifacts.sh

@@ -34,8 +34,8 @@ cp ./src/main/appengine/app.yaml $STAGE_DIR
 cd $BUILD_REPOSITORY_LOCALPATH
 
 # Zip integration tests and upload it as artifact
-# pushd testing
-# zip -r testing.zip *
-# cp testing.zip $STAGE_DIR
-# popd
+pushd testing
+zip -r testing.zip *
+cp testing.zip $STAGE_DIR
+popd