From 4e2a7c07e578d7b68605b2b7e21707217cbe8ced Mon Sep 17 00:00:00 2001
From: Oliver Chang <oliverchang@users.noreply.github.com>
Date: Wed, 29 Jul 2020 12:39:49 +1000
Subject: Many build infra fixes. (#4209)

- Remove base image project argument from deploy.sh. Deploy all
  functions to the main oss-fuzz image.
- Reduce max instances of functions to 1 to avoid rate limiting issues.
- Fix missing ndb context initialization in request_build.py
- Fix incorrect tags in BuildHistory entities. "-" was doubled.
- Fix base build deployment with incorrect schedule variable.
- Add scripts for requesting builds locally.
---
 infra/build/functions/deploy.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'infra/build/functions/deploy.sh')

diff --git a/infra/build/functions/deploy.sh b/infra/build/functions/deploy.sh
index 0c361a3d..26f99cbb 100755
--- a/infra/build/functions/deploy.sh
+++ b/infra/build/functions/deploy.sh
@@ -83,19 +83,19 @@ function deploy_cloud_function {
 	--trigger-topic $topic \
 	--runtime python37 \
 	--project $project \
-	--timeout 540
+	--timeout 540 \
+  --max-instances 1
 }
 
-if [ $# == 2 ]; then
+if [ $# == 1 ]; then
 	PROJECT_ID=$1
-	BASE_PROJECT_ID=$2
 else
-	echo -e "\n Usage ./deploy.sh <project-name> <base-project-name>"; exit;
+	echo -e "\n Usage ./deploy.sh <project-name>"; exit;
 fi
 
 deploy_pubsub_topic $BUILD_JOB_TOPIC $PROJECT_ID
 deploy_pubsub_topic $SYNC_JOB_TOPIC $PROJECT_ID
-deploy_pubsub_topic $BASE_IMAGE_JOB_TOPIC $BASE_PROJECT_ID
+deploy_pubsub_topic $BASE_IMAGE_JOB_TOPIC $PROJECT_ID
 deploy_pubsub_topic $COVERAGE_BUILD_JOB_TOPIC $PROJECT_ID
 deploy_pubsub_topic $UPDATE_BUILD_JOB_TOPIC $PROJECT_ID
 
@@ -106,10 +106,10 @@ deploy_scheduler $SYNC_SCHEDULER_JOB \
 				  $PROJECT_ID
 
 deploy_scheduler $BASE_IMAGE_SCHEDULER_JOB \
-				 "$BASE_IMAGE SCHEDULE" \
+				 "$BASE_IMAGE_SCHEDULE" \
 				  $BASE_IMAGE_JOB_TOPIC \
 				  "$BASE_IMAGE_MESSAGE" \
-				  $BASE_PROJECT_ID
+				  $PROJECT_ID
 
 deploy_scheduler $COVERAGE_BUILD_SCHEDULER_JOB \
 				 "$COVERAGE_BUILD_SCHEDULE" \
@@ -121,7 +121,7 @@ deploy_scheduler $UPDATE_BUILD_SCHEDULER_JOB \
 				 "$UPDATE_BUILD_JOB_SCHEDULE" \
 				 $UPDATE_BUILD_JOB_TOPIC \
 				 "$UPDATE_BUILD_MESSAGE" \
-				 $PROJECT_ID 
+				 $PROJECT_ID
 
 
 deploy_cloud_function sync \
@@ -132,7 +132,7 @@ deploy_cloud_function sync \
 deploy_cloud_function base-image-build \
 					  build_base_images \
 					  $BASE_IMAGE_JOB_TOPIC \
-					  $BASE_PROJECT_ID
+					  $PROJECT_ID
 
 deploy_cloud_function request-build \
 					  build_project \
-- 
cgit v1.2.3