From 4bbfd0c337ffacfa5bcde5414a73e5d53f9310ff Mon Sep 17 00:00:00 2001
From: Asim R P <apraveen@pivotal.io>
Date: Mon, 15 Apr 2019 17:22:58 +0530
Subject: [PATCH] Parameterize pipeline config to control binary swap tests

Binary swap tests need to be enabled only on stable branches but not on master.
This commit makes it easy to enable / disable binary swap tests in a pipeline,
especially when gen_pipeline.py is used to generate it.
---
 concourse/pipelines/templates/gpdb-tpl.yml | 9 ++++-----
 concourse/tasks/ic_gpdb_binary_swap.yml    | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml
index 61d665f1b5..552a130275 100644
--- a/concourse/pipelines/templates/gpdb-tpl.yml
+++ b/concourse/pipelines/templates/gpdb-tpl.yml
@@ -426,8 +426,8 @@ resources:
 - name: gpdb_src_binary_swap
   type: git
   source:
-    branch: master
-    uri: https://github.com/greenplum-db/gpdb.git
+    branch: {{gpdb-binary-swap-git-tag}}
+    uri: {{gpdb-binary-swap-git-remote}}
     ignore_paths:
     - gpdb-doc/*
     - README*
@@ -1177,12 +1177,12 @@ jobs:
       trigger: [[ test_trigger ]]
     - get: gpdb6-centos6-test
   - task: ic_gpdb
-    file: gpdb_src/concourse/tasks/ic_gpdb.yml
+    file: gpdb_src/concourse/tasks/ic_gpdb_binary_swap.yml
     image: gpdb6-centos6-test
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world
       TEST_OS: centos
-      TEST_BINARY_SWAP: false
+      TEST_BINARY_SWAP: {{test-binary-swap}}
       CONFIGURE_FLAGS: {{configure_flags}}
 
 - name: icw_gporca_centos6
@@ -1279,7 +1279,6 @@ jobs:
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world
       TEST_OS: centos
-      TEST_BINARY_SWAP: false
       CONFIGURE_FLAGS: {{configure_flags}}
 
 {% endif %}
diff --git a/concourse/tasks/ic_gpdb_binary_swap.yml b/concourse/tasks/ic_gpdb_binary_swap.yml
index 0f6fd51dbc..3997b8a119 100644
--- a/concourse/tasks/ic_gpdb_binary_swap.yml
+++ b/concourse/tasks/ic_gpdb_binary_swap.yml
@@ -10,7 +10,7 @@ params:
   MAKE_TEST_COMMAND: ""
   BLDWRAP_POSTGRES_CONF_ADDONS: ""
   TEST_OS: ""
-  TEST_BINARY_SWAP: true
+  TEST_BINARY_SWAP: ""
   CONFIGURE_FLAGS: ""
 run:
   path: gpdb_src/concourse/scripts/ic_gpdb.bash
-- 
GitLab