Merge branch 'integration-master' into elastic

# Conflicts:
#	provider/indexer-gcp/cloudbuild/cloudbuild.yaml

provider/indexer-gcp/cloudbuild/cloudbuild.yaml

@@ -20,12 +20,12 @@ steps:
             'build',
             '--build-arg', 'PROVIDER_NAME=${_PROVIDER_NAME}',
             '--build-arg', 'PORT=${_PORT}',
-            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/indexer-${_PROVIDER_NAME}:${_SHORT_SHA}',
-            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/indexer-${_PROVIDER_NAME}:latest',
-            '-f', 'provider/indexer-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild',
+            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}:${_SHORT_SHA}',
+            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}:latest',
+            '-f', 'provider/${_GCP_SERVICE}-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild',
             '.'
     ]
 
 images:
-  - 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/indexer-${_PROVIDER_NAME}'
+  - 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}'