From 9665a223b8747fddf2091a2d678b62e6e08e0df5 Mon Sep 17 00:00:00 2001
From: alberhander <albertoh@carto.com>
Date: Tue, 2 Feb 2021 12:46:31 +0100
Subject: [PATCH] try with substitutions 2

---
 script/ci/cloudbuild-new-pr-pg11.yaml | 6 ++----
 script/ci/cloudbuild-new-pr-pg12.yaml | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/script/ci/cloudbuild-new-pr-pg11.yaml b/script/ci/cloudbuild-new-pr-pg11.yaml
index 81f5549436..9dd7840636 100644
--- a/script/ci/cloudbuild-new-pr-pg11.yaml
+++ b/script/ci/cloudbuild-new-pr-pg11.yaml
@@ -57,8 +57,6 @@ steps:
 
 # Copy files to the right directories to run the tests
 - name: ubuntu
-  substitutions: 
-    _BRANCH_TAG: $_TMP_BRANCH_TAG
   entrypoint: /bin/bash
   args:
     - -c
@@ -73,8 +71,6 @@ steps:
 
 # Build image
 - name: gcr.io/cloud-builders/docker
-  substitutions: 
-    _BRANCH_TAG: $_TMP_BRANCH_TAG
   entrypoint: /bin/bash
   args:
     - -cx
@@ -97,6 +93,8 @@ steps:
   args: ['exec', '-i', 'builder_1', 'bash', '-c', '/cartodb/runParallelTests.sh 24' ]
   timeout: 2700s
 
+substitutions: 
+    _BRANCH_TAG: $_TMP_BRANCH_TAG
 options:
     machineType: 'N1_HIGHCPU_32'
 timeout: 3600s
diff --git a/script/ci/cloudbuild-new-pr-pg12.yaml b/script/ci/cloudbuild-new-pr-pg12.yaml
index f40a405e3e..f63e909818 100644
--- a/script/ci/cloudbuild-new-pr-pg12.yaml
+++ b/script/ci/cloudbuild-new-pr-pg12.yaml
@@ -72,8 +72,6 @@ steps:
 # Build image
 - name: gcr.io/cloud-builders/docker
   entrypoint: /bin/bash
-  substitutions: 
-    _BRANCH_TAG: $_TMP_BRANCH_TAG
   args:
     - -cx
     - |
@@ -109,6 +107,8 @@ steps:
   args: ['exec', '-i', 'builder_1', 'bash', '-c', '/cartodb/runParallelTests.sh 24' ]
   timeout: 2700s
 
+substitutions: 
+    _BRANCH_TAG: $_TMP_BRANCH_TAG
 options:
     machineType: 'N1_HIGHCPU_32'
 timeout: 3600s