First customization to avm99963-bugs
- Only a service is used (default) in order to keep usage within Google
Cloud's free tier.
- Settings have been adapted.
- Only a single DB instance is used (primary).
- Some cron jobs are executed less often.
- |threadsafe| has been set to "yes" so the single instance can serve
concurrent requests (otherwise the search/list issues function
breaks).
GitOrigin-RevId: 52130750a30a5aa2234a6dd3f5ae23c3fb1b8343
diff --git a/Makefile b/Makefile
index f94295e..41246b7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
DEVID = monorail-dev
STAGEID= monorail-staging
-PRODID= monorail-prod
+PRODID= avm99963-bugs
GAE_PY?= python gae.py
DEV_APPSERVER_FLAGS?= --watcher_ignore_re="(.*/lib|.*/node_modules|.*/third_party|.*/venv)"
@@ -136,51 +136,30 @@
# Service yaml files used by gae.py are expected to be named module-<service-name>.yaml
config_prod:
m4 -DPROD < app.yaml.m4 > app.yaml
- m4 -DPROD < module-besearch.yaml.m4 > module-besearch.yaml
- m4 -DPROD < module-latency-insensitive.yaml.m4 > module-latency-insensitive.yaml
- m4 -DPROD < module-api.yaml.m4 > module-api.yaml
# Generate yaml files used by spinnaker.
config_prod_cloud:
m4 -DPROD < app.yaml.m4 > app.prod.yaml
- m4 -DPROD < module-besearch.yaml.m4 > besearch.prod.yaml
- m4 -DPROD < module-latency-insensitive.yaml.m4 > latency-insensitive.prod.yaml
- m4 -DPROD < module-api.yaml.m4 > api.prod.yaml
config_staging:
m4 -DSTAGING < app.yaml.m4 > app.yaml
- m4 -DSTAGING < module-besearch.yaml.m4 > module-besearch.yaml
- m4 -DSTAGING < module-latency-insensitive.yaml.m4 > module-latency-insensitive.yaml
- m4 -DSTAGING < module-api.yaml.m4 > module-api.yaml
config_staging_cloud:
m4 -DSTAGING < app.yaml.m4 > app.staging.yaml
- m4 -DSTAGING < module-besearch.yaml.m4 > besearch.staging.yaml
- m4 -DSTAGING < module-latency-insensitive.yaml.m4 > latency-insensitive.staging.yaml
- m4 -DSTAGING < module-api.yaml.m4 > api.staging.yaml
config_dev:
m4 -DDEV < app.yaml.m4 > app.yaml
- m4 -DDEV < module-besearch.yaml.m4 > module-besearch.yaml
- m4 -DDEV < module-latency-insensitive.yaml.m4 > module-latency-insensitive.yaml
- m4 -DDEV < module-api.yaml.m4 > module-api.yaml
config_dev_cloud:
m4 -DDEV < app.yaml.m4 > app.yaml
- m4 -DDEV < module-besearch.yaml.m4 > besearch.yaml
- m4 -DDEV < module-latency-insensitive.yaml.m4 > latency-insensitive.yaml
- m4 -DDEV < module-api.yaml.m4 > api.yaml
config_local:
m4 app.yaml.m4 > app.yaml
- m4 module-besearch.yaml.m4 > module-besearch.yaml
- m4 module-latency-insensitive.yaml.m4 > module-latency-insensitive.yaml
- m4 module-api.yaml.m4 > module-api.yaml
deploy_dev: clean_deps deps build_js config_dev
$(eval BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD))
@echo "---[Dev $(DEVID)]---"
- $(GAE_PY) upload --tag $(BRANCH_NAME) -A $(DEVID) $(FRONTEND_MODULES) $(BACKEND_MODULES)
+ $(GAE_PY) upload --tag $(BRANCH_NAME) -A $(DEVID) $(FRONTEND_MODULES)
deploy_cloud_dev: clean_deps deps build_js config
$(eval GCB_DIR:= $(shell mktemp -d -p /tmp monorail_XXXXX))
@@ -213,12 +192,12 @@
# throwaway databases.
deploy_staging: clean_deps deps build_js config_staging
@echo "---[Staging $(STAGEID)]---"
- $(GAE_PY) upload -A $(STAGEID) $(FRONTEND_MODULES) $(BACKEND_MODULES)
+ $(GAE_PY) upload -A $(STAGEID) $(FRONTEND_MODULES)
# This is our production server that users actually use.
deploy_prod: clean_deps deps build_js config_prod
@echo "---[Deploying prod instance $(PRODID)]---"
- $(GAE_PY) upload -A $(PRODID) $(FRONTEND_MODULES) $(BACKEND_MODULES)
+ $(GAE_PY) upload -A $(PRODID) $(FRONTEND_MODULES)
# Note that we do not provide a command-line way to make the newly-uploaded
# version the default version. This is for two reasons: a) You should be using