Patch 5.4.1 - Marketing, SAP Finance, SFDC & Sustainability 🌼 (#2)

GoogleCloudPlatform · May 15, 2024 · 46406c5 · 46406c5
1 parent 542e238
commit 46406c5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 32 deletions.
diff --git a/cloudbuild.models.yaml b/cloudbuild.models.yaml
@@ -1,22 +1,20 @@
 # gcloud builds submit --config=cloudbuild.yaml .
 steps:
   - name: gcr.io/cloud-builders/gcloud
-    entrypoint: "bash"
-    args:
-      - "-c"
-      - |-
-        ./deploy.sh \
-          --source-project '${_PJID_SRC}' \
-          --target-project '${_PJID_TGT}' \
-          --cdc-processed-dataset '${_DS_CDC}' \
-          --raw-landing-dataset '${_DS_RAW}' \
-          --target-reporting-dataset '${_DS_REPORTING}' \
-          --target-models-dataset '${_DS_MODELS}' \
-          --location '${_LOCATION}' \
-          --mandt '${_MANDT}' \
-          --sql-flavour '${_SQL_FLAVOUR}' \
-            '${_VIEWS_DIR}'
-logsBucket: "gs://$_GCS_BUCKET"
+    script: |
+      #!/usr/bin/env bash
+      ./deploy.sh \
+        --source-project ${_PJID_SRC} \
+        --target-project ${_PJID_TGT} \
+        --cdc-processed-dataset ${_DS_CDC} \
+        --raw-landing-dataset ${_DS_RAW} \
+        --target-reporting-dataset ${_DS_REPORTING} \
+        --target-models-dataset ${_DS_MODELS} \
+        --location ${_LOCATION} \
+        --mandt ${_MANDT} \
+        --sql-flavour ${_SQL_FLAVOUR} \
+          ${_VIEWS_DIR}
+logsBucket: "gs://${_GCS_BUCKET}"
 timeout: 7200s
 substitutions:
   _VIEWS_DIR: src/views
@@ -27,3 +25,4 @@ substitutions:
   _SQL_FLAVOUR: "ECC"
 options:
   substitution_option: "ALLOW_LOOSE"
+  automapSubstitutions: true
diff --git a/pipeline/cloudbuild.view.yaml b/pipeline/cloudbuild.view.yaml
@@ -1,20 +1,18 @@
 steps:
   - name: gcr.io/kittycorn-public/deploy-kittycorn:v2.0
-    entrypoint: "bash"
-    args:
-      - "-c"
-      - |-
-        ./pipeline/view.sh \
-          --source-project '${_PJID_SRC}' \
-          --target-project '${_PJID_TGT}' \
-          --raw-landing-dataset '${_DS_RAW}' \
-          --cdc-processed-dataset '${_DS_CDC}' \
-          --target-reporting-dataset '${_DS_REPORTING}' \
-          --target-models-dataset '${_DS_MODELS}' \
-          --location '${_LOCATION}' \
-          --mandt '${_MANDT}' \
-          --sql-flavour '${_SQL_FLAVOUR}' \
-            '${_SQL_FILE}'
+    script: |
+      #!/usr/bin/env bash
+      ./pipeline/view.sh \
+        --source-project ${_PJID_SRC} \
+        --target-project ${_PJID_TGT} \
+        --raw-landing-dataset ${_DS_RAW} \
+        --cdc-processed-dataset ${_DS_CDC} \
+        --target-reporting-dataset ${_DS_REPORTING} \
+        --target-models-dataset ${_DS_MODELS} \
+        --location ${_LOCATION} \
+        --mandt ${_MANDT} \
+        --sql-flavour ${_SQL_FLAVOUR} \
+          ${_SQL_FILE}
 timeout: 1200s
 substitutions:
   _SQL_FILE: none
@@ -24,3 +22,4 @@ substitutions:
   _SQL_FLAVOUR: "ECC"
 options:
   substitution_option: "ALLOW_LOOSE"
+  automapSubstitutions: true
diff --git a/pipeline/view.sh b/pipeline/view.sh
@@ -4,7 +4,6 @@
 # Help Message
 #--------------------
 
-
 usage() {
   cat <<HELP_USAGE