dont build in parallel

script/ci/cloudbuild-build-master.yaml

@@ -138,16 +138,10 @@ steps:
   dir: /workspace/cartodb-onprem
   entrypoint: /bin/bash
   args:
-    - -cx
+    - -e
     - |
-      docker pull ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG}
-      if [ $? -ne 0 ]
-      then
-        docker pull ${_DOCKER_IMAGE_NAME}:latest
-      fi
-      set -e
       docker build --label="org.opencontainers.image.created=$$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${COMMIT_SHA} --build-arg GRUNT_ENV=production --build-arg COMPILE_ASSETS=true --build-arg BUNDLE_JOBS=4 -t ${_DOCKER_IMAGE_NAME}-onprem:latest -t ${_DOCKER_IMAGE_NAME}-onprem:${_BRANCH_TAG} -t ${_DOCKER_IMAGE_NAME}-onprem:${SHORT_SHA} -t ${_DOCKER_IMAGE_NAME}-onprem:${_BRANCH_TAG}--${SHORT_SHA} --cache-from ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG} --cache-from ${_DOCKER_IMAGE_NAME}:latest .
-  waitFor: ['checkout-licensing-gear']
+  waitFor: ['build-cartodb']
 
 # Push image
 - name: gcr.io/cloud-builders/docker

script/ci/cloudbuild-build-pr-branch.yaml

@@ -138,16 +138,10 @@ steps:
   dir: /workspace/cartodb-onprem
   entrypoint: /bin/bash
   args:
-    - -cx
+    - -e
     - |
-      docker pull ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG}
-      if [ $? -ne 0 ]
-      then
-        docker pull ${_DOCKER_IMAGE_NAME}:latest
-      fi
-      set -e
       docker build --label="org.opencontainers.image.created=$$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${COMMIT_SHA} --build-arg GRUNT_ENV=production --build-arg COMPILE_ASSETS=true --build-arg BUNDLE_JOBS=4 -t ${_DOCKER_IMAGE_NAME}-onprem:latest -t ${_DOCKER_IMAGE_NAME}-onprem:${_BRANCH_TAG} -t ${_DOCKER_IMAGE_NAME}-onprem:${SHORT_SHA} -t ${_DOCKER_IMAGE_NAME}-onprem:${_BRANCH_TAG}--${SHORT_SHA} --cache-from ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG} --cache-from ${_DOCKER_IMAGE_NAME}:latest .
-  waitFor: ['checkout-licensing-gear']
+  waitFor: ['build-cartodb']
 
 timeout: 1800s
 images:

script/ci/cloudbuild-onprem-dev-tests.yaml

@@ -192,16 +192,10 @@ steps:
   dir: /workspace/cartodb-onprem
   entrypoint: /bin/bash
   args:
-    - -cx
+    - -e
     - |
-      docker pull ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG}
-      if [ $? -ne 0 ]
-      then
-        docker pull ${_DOCKER_IMAGE_NAME}:latest
-      fi
-      set -e
       docker build --label="org.opencontainers.image.created=$$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${COMMIT_SHA} --build-arg GRUNT_ENV=production --build-arg COMPILE_ASSETS=true --build-arg BUNDLE_JOBS=4 -t ${_DOCKER_IMAGE_NAME}-onprem:latest -t ${_DOCKER_IMAGE_NAME}-onprem:${_BRANCH_TAG} -t ${_DOCKER_IMAGE_NAME}-onprem:${SHORT_SHA} -t ${_DOCKER_IMAGE_NAME}-onprem:${_BRANCH_TAG}--${SHORT_SHA} --cache-from ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG} --cache-from ${_DOCKER_IMAGE_NAME}:latest .
-  waitFor: ['checkout-licensing-gear']
+  waitFor: ['build-cartodb']
 
 ## docker-dev-env tests ##