From 3200bd5fccbfc74f41b6e29a6710ad57afb19845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Ruiz?= <manuellr.git@gmail.com>
Date: Wed, 18 Aug 2021 18:13:30 +0200
Subject: [PATCH] Fix cloudbuild

---
 script/ci/cloudbuild-onprem-dev-tests.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/script/ci/cloudbuild-onprem-dev-tests.yaml b/script/ci/cloudbuild-onprem-dev-tests.yaml
index 8de5b4532d..89d4fb0326 100644
--- a/script/ci/cloudbuild-onprem-dev-tests.yaml
+++ b/script/ci/cloudbuild-onprem-dev-tests.yaml
@@ -278,6 +278,8 @@ steps:
   entrypoint: /bin/sh
   dir: /workspace/dockerize-onpremises
   args: ['ci/init.sh']
+  env: &onprem-vars
+    - 'COMPOSE_FILE=docker-compose.yml:ci/docker-compose.ci.yml'
   waitFor: ['copy-onprem-files']
 
 # Install license
@@ -285,6 +287,7 @@ steps:
   id: license-onprem
   entrypoint: /bin/bash
   dir: /workspace/dockerize-onpremises
+  env: *onprem-vars
   args: 
     - -cex
     - |
@@ -297,6 +300,7 @@ steps:
   id: test-onprem
   entrypoint: /bin/bash
   dir: /workspace/dockerize-onpremises
+  env: *onprem-vars
   args: 
       - -cx
       - |
@@ -318,10 +322,11 @@ steps:
   id: logs-onprem
   entrypoint: /bin/sh
   dir: /workspace/dockerize-onpremises
+  env: *onprem-vars
   args:
     - -c
     - |
-      docker-compose -f docker-compose.yml -f ci/docker-compose.ci.yml logs --no-color > onprem_docker_compose_logs
+      COMPOSE_FILE=$${COMPOSE_FILE} docker-compose logs --no-color > onprem_docker_compose_logs
       echo "Logs will be available during 14 days at gs://${_REPO}-ci-tmp-logs/test_logs_${BUILD_ID}/"
   waitFor: ['test-onprem']