@@ -36,9 +36,9 @@ gcloud_setup: &gcloud_setup
36
36
run :
37
37
name : setup gcloud
38
38
command : |
39
- # install
39
+ # install
40
40
sudo curl https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz > /tmp/google-cloud-sdk.tar.gz
41
- sudo mkdir -p /usr/local/gcloud
41
+ sudo mkdir -p /usr/local/gcloud
42
42
sudo tar -C /usr/local/gcloud -xvf /tmp/google-cloud-sdk.tar.gz
43
43
sudo /usr/local/gcloud/google-cloud-sdk/install.sh --quiet
44
44
echo PATH=$PATH:/usr/local/gcloud/google-cloud-sdk/bin >> ~/.bashrc
@@ -190,7 +190,7 @@ jobs:
190
190
command : |
191
191
./cc-test-reporter before-build
192
192
. venv/bin/activate
193
- coverage combine parallel-coverage/
193
+ coverage combine parallel-coverage/
194
194
coverage xml
195
195
coverage report
196
196
./cc-test-reporter format-coverage -o ./.coverage -t coverage.py
@@ -221,18 +221,21 @@ jobs:
221
221
echo "CELERY_BROKER_URL"=$(echo $IMAGE_CELERY_BROKER_URL_PRODUCTION) >> .env
222
222
echo "CELERY_RESULT_BACKEND"=$(echo $IMAGE_CELERY_RESULT_BACKEND_PRODUCTION) >> .env
223
223
echo "MRM_PUSH_URL"=$(echo $IMAGE_MRM_PUSH_URL_PRODUCTION) >> .env
224
+ echo "PROD_REQUEST_URL"=$(echo $IMAGE_PROD_REQUEST_URL) >> .env
224
225
elif [ "$CIRCLE_BRANCH" == develop ]; then
225
226
echo "DEV_DATABASE_URL"=$(echo $IMAGE_DEV_DATABASE_URL_STAGING) >> .env
226
227
echo "DATABASE_URL"=$(echo $IMAGE_DATABASE_URL_STAGING) >> .env
227
228
echo "CELERY_BROKER_URL"=$(echo $IMAGE_CELERY_BROKER_URL_STAGING) >> .env
228
229
echo "CELERY_RESULT_BACKEND"=$(echo $IMAGE_CELERY_RESULT_BACKEND_STAGING) >> .env
229
230
echo "MRM_PUSH_URL"=$(echo $IMAGE_MRM_PUSH_URL_STAGING) >> .env
231
+ echo "PROD_REQUEST_URL"=$(echo $IMAGE_PROD_REQUEST_URL) >> .env
230
232
else
231
233
echo "DEV_DATABASE_URL"=$(echo $IMAGE_DEV_DATABASE_URL_SANDBOX) >> .env
232
234
echo "DATABASE_URL"=$(echo $IMAGE_DATABASE_URL_SANDBOX) >> .env
233
235
echo "CELERY_BROKER_URL"=$(echo $IMAGE_CELERY_BROKER_URL_SANDBOX) >> .env
234
236
echo "CELERY_RESULT_BACKEND"=$(echo $IMAGE_CELERY_RESULT_BACKEND_SANDBOX) >> .env
235
237
echo "MRM_PUSH_URL"=$(echo $IMAGE_MRM_PUSH_URL_SANDBOX) >> .env
238
+ echo "PROD_REQUEST_URL"=$(echo $IMAGE_PROD_REQUEST_URL) >> .env
236
239
fi
237
240
echo "SECRET_KEY"=$(echo $IMAGE_SECRET_KEY) >> .env
238
241
echo "MAIL_SERVER"=$(echo $IMAGE_MAIL_SERVER) >> .env
@@ -301,13 +304,13 @@ jobs:
301
304
command : |
302
305
if [ "$CIRCLE_BRANCH" == master ] || [ "$CIRCLE_BRANCH" == develop ]; then
303
306
touch google-service-key.json
304
- echo $GOOGLE_CREDENTIALS_STAGING | base64 --decode >> google-service-key.json
307
+ echo $GOOGLE_CREDENTIALS_STAGING | base64 --decode >> google-service-key.json
305
308
gcloud auth activate-service-account --key-file google-service-key.json
306
309
gcloud --quiet config set project ${GOOGLE_PROJECT_ID_STAGING}
307
310
gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}
308
311
else
309
312
touch google-service-key.json
310
- echo $GOOGLE_CREDENTIALS_SANDBOX | base64 --decode >> google-service-key.json
313
+ echo $GOOGLE_CREDENTIALS_SANDBOX | base64 --decode >> google-service-key.json
311
314
gcloud auth activate-service-account --key-file google-service-key.json
312
315
gcloud --quiet config set project ${GOOGLE_PROJECT_ID_SANDBOX}
313
316
gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}
0 commit comments