diff --git a/provider/indexer-gcp/scripts/deploy.sh b/provider/indexer-gcp/scripts/deploy.sh index ae88fe8fe872e22bef9b69507b5ab490cfb7a002..fce3deef9e7edc096071c60393b4844e65153057 100644 --- a/provider/indexer-gcp/scripts/deploy.sh +++ b/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 diff --git a/provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl b/provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl index 4f2faf192b621ffcb074f87415f1a02d01f96637..719b0f0c1f259d6fc2ab9a21870f87ee28b763d3 100644 --- a/provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl +++ b/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" diff --git a/provider/indexer-gcp/scripts/stage-artifacts.sh b/provider/indexer-gcp/scripts/stage-artifacts.sh index af42acd727039188c60ada5d6c8a4d65ca0f3fa3..20056c7ee1d1f93d85fafbf56026df777845b270 100644 --- a/provider/indexer-gcp/scripts/stage-artifacts.sh +++ b/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