Change the output filename for compile_gpdb_with_llvm_asserts job

Authored-by: Ning Wu <ningw@vmware.com>
mperezfuster · Dec 13, 2023 · 1b4a5af · 1b4a5af
1 parent 89aa114
commit 1b4a5af
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/concourse/pipelines/gpdb_main-generated.yml b/concourse/pipelines/gpdb_main-generated.yml
@@ -12,7 +12,7 @@
 ## file (example: templates/gpdb-tpl.yml) and regenerate the pipeline
 ## using appropriate tool (example: gen_pipeline.py -t prod).
 ## ----------------------------------------------------------------------
-## Generated by gen_pipeline.py at: 2023-12-12 11:15:26.091422
+## Generated by gen_pipeline.py at: 2023-12-13 17:36:49.888647
 ## Template file: gpdb-tpl.yml
 ## OS Types: 
 ## Test Sections: ['icw', 'cli', 'release']
@@ -488,7 +488,7 @@ resources:
   source:
     bucket: ((gcs-bucket-intermediates))
     json_key: ((concourse-gcs-resources-service-account-key))
-    versioned_file: ((pipeline-name))/bin_gpdb/bin_gpdb.tar.gz
+    versioned_file: ((pipeline-name))/bin_gpdb/bin_gpdb_with_llvm_asserts.tar.gz
 
 - name: llvm-with-asserts-packages
   type: gcs
@@ -608,11 +608,12 @@ jobs:
       CONFIGURE_FLAGS: ((configure_flags_with_extensions))
       BLD_TARGETS: "clients"
       RC_BUILD_TYPE_GCS: ((rc-build-type-gcs))
+      GPDB_BIN_FILENAME: bin_gpdb_with_llvm_asserts.tar.gz
   - in_parallel:
       steps:
       - put: bin_gpdb_with_llvm_asserts
         params:
-          file: gpdb_artifacts/bin_gpdb.tar.gz
+          file: gpdb_artifacts/bin_gpdb_with_llvm_asserts.tar.gz
 
 - name: prepare_binary_swap_gpdb_rocky8
   plan:
@@ -832,6 +833,7 @@ jobs:
       - get: llvm-with-asserts-packages
       - get: bin_gpdb_with_llvm_asserts
         passed: [gate_icw_start]
+        trigger: true
   - task: ic_gpdb
     tags: [icw-worker]
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
@@ -908,6 +910,7 @@ jobs:
       - get: llvm-with-asserts-packages
       - get: bin_gpdb_with_llvm_asserts
         passed: [gate_icw_start]
+        trigger: true
   - task: ic_gpdb
     tags: [icw-worker]
     file: gpdb_src/concourse/tasks/ic_gpdb_binary_swap.yml

diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml
@@ -555,7 +555,7 @@ resources:
   source:
     bucket: ((gcs-bucket-intermediates))
     json_key: ((concourse-gcs-resources-service-account-key))
-    versioned_file: ((pipeline-name))/bin_gpdb/bin_gpdb.tar.gz
+    versioned_file: ((pipeline-name))/bin_gpdb/bin_gpdb_with_llvm_asserts.tar.gz
 
 - name: llvm-with-asserts-packages
   type: gcs
@@ -712,11 +712,12 @@ jobs:
       CONFIGURE_FLAGS: ((configure_flags_with_extensions))
       BLD_TARGETS: "clients"
       RC_BUILD_TYPE_GCS: ((rc-build-type-gcs))
+      GPDB_BIN_FILENAME: bin_gpdb_with_llvm_asserts.tar.gz
   - in_parallel:
       steps:
       - put: bin_gpdb_with_llvm_asserts
         params:
-          file: gpdb_artifacts/bin_gpdb.tar.gz
+          file: gpdb_artifacts/bin_gpdb_with_llvm_asserts.tar.gz
 {% endif %}
 
 {% if os_type == "rhel8" or os_type == "oel8" or os_type == "rocky8" %}
@@ -957,6 +958,7 @@ jobs:
       - get: llvm-with-asserts-packages
       - get: bin_gpdb_with_llvm_asserts
         passed: [gate_icw_start]
+        trigger: true
       {% endif %}
   - task: ic_gpdb
     {% if use_ICW_workers %}
@@ -1051,6 +1053,7 @@ jobs:
       - get: llvm-with-asserts-packages
       - get: bin_gpdb_with_llvm_asserts
         passed: [gate_icw_start]
+        trigger: true
       {% endif %}
   - task: ic_gpdb
     {% if use_ICW_workers %}

diff --git a/concourse/scripts/common.bash b/concourse/scripts/common.bash
@@ -31,7 +31,7 @@ function build_arch() {
 function install_gpdb() {
     mkdir -p /usr/local/greenplum-db-devel
     if [[ "${CONFIGURE_FLAGS}" =~ enable-cassert && -d bin_gpdb_with_llvm_asserts ]]; then
-      tar -xzf bin_gpdb_with_llvm_asserts/bin_gpdb.tar.gz -C /usr/local/greenplum-db-devel
+      tar -xzf bin_gpdb_with_llvm_asserts/bin_gpdb_with_llvm_asserts.tar.gz -C /usr/local/greenplum-db-devel
     else
       tar -xzf bin_gpdb/bin_gpdb.tar.gz -C /usr/local/greenplum-db-devel
     fi

diff --git a/concourse/tasks/compile_gpdb.yml b/concourse/tasks/compile_gpdb.yml
@@ -18,3 +18,4 @@ params:
   RC_BUILD_TYPE_GCS:
   USE_CCACHE:
   SKIP_UNITTESTS:
+  GPDB_BIN_FILENAME: