From 3f4ff19e7d8e61e2314840d91c5400c2456d3866 Mon Sep 17 00:00:00 2001
From: Adam Lee <ali@pivotal.io>
Date: Mon, 9 Jan 2017 13:53:55 +0800
Subject: [PATCH] More generic with respect to sync_tools OS

---
 concourse/pipelines/pipeline.yml      | 10 +++++-----
 concourse/pipelines/pr_pipeline.yml   |  2 +-
 concourse/scripts/common.bash         |  2 +-
 concourse/tasks/gpMgmt_check_gpdb.yml |  2 +-
 concourse/tasks/ic_gpdb.yml           |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/concourse/pipelines/pipeline.yml b/concourse/pipelines/pipeline.yml
index a41b3fa408..3b0f594d96 100644
--- a/concourse/pipelines/pipeline.yml
+++ b/concourse/pipelines/pipeline.yml
@@ -180,7 +180,7 @@ jobs:
   - aggregate:
     - get: gpdb_src
       passed: [compile_gpdb_centos6]
-    - get: sync_tools_gpdb_centos
+    - get: sync_tools_gpdb
       resource: sync_tools_gpdb_centos
       passed: [compile_gpdb_centos6]
     - get: bin_gpdb
@@ -202,7 +202,7 @@ jobs:
   - aggregate:
     - get: gpdb_src
       passed: [compile_gpdb_centos6]
-    - get: sync_tools_gpdb_centos
+    - get: sync_tools_gpdb
       resource: sync_tools_gpdb_centos
       passed: [compile_gpdb_centos6]
     - get: bin_gpdb
@@ -224,7 +224,7 @@ jobs:
   - aggregate:
     - get: gpdb_src
       passed: [compile_gpdb_centos6]
-    - get: sync_tools_gpdb_centos
+    - get: sync_tools_gpdb
       resource: sync_tools_gpdb_centos
       passed: [compile_gpdb_centos6]
     - get: bin_gpdb
@@ -246,7 +246,7 @@ jobs:
   - aggregate:
     - get: gpdb_src
       passed: [compile_gpdb_centos6]
-    - get: sync_tools_gpdb_centos
+    - get: sync_tools_gpdb
       resource: sync_tools_gpdb_centos
       passed: [compile_gpdb_centos6]
     - get: bin_gpdb
@@ -267,7 +267,7 @@ jobs:
   - aggregate:
     - get: gpdb_src
       passed: [compile_gpdb_centos6]
-    - get: sync_tools_gpdb_centos
+    - get: sync_tools_gpdb
       resource: sync_tools_gpdb_centos
       passed: [compile_gpdb_centos6]
     - get: bin_gpdb
diff --git a/concourse/pipelines/pr_pipeline.yml b/concourse/pipelines/pr_pipeline.yml
index f2159e90a9..ef918b7ac9 100644
--- a/concourse/pipelines/pr_pipeline.yml
+++ b/concourse/pipelines/pr_pipeline.yml
@@ -138,7 +138,7 @@ jobs:
     - aggregate:
       - get: gpdb_pr
         passed: [compile_gpdb_centos6]
-      - get: sync_tools_gpdb_centos
+      - get: sync_tools_gpdb
         resource: sync_tools_gpdb_centos
         passed: [compile_gpdb_centos6]
       - get: bin_gpdb
diff --git a/concourse/scripts/common.bash b/concourse/scripts/common.bash
index 1c29347a3e..d541f566b9 100644
--- a/concourse/scripts/common.bash
+++ b/concourse/scripts/common.bash
@@ -19,7 +19,7 @@ function install_gpdb() {
 }
 
 function install_sync_tools() {
-    tar -xzf sync_tools_gpdb_centos/sync_tools_gpdb.tar.gz -C gpdb_src/gpAux
+    tar -xzf sync_tools_gpdb/sync_tools_gpdb.tar.gz -C gpdb_src/gpAux
 }
 
 function configure() {
diff --git a/concourse/tasks/gpMgmt_check_gpdb.yml b/concourse/tasks/gpMgmt_check_gpdb.yml
index ee77d16af3..984a66534f 100644
--- a/concourse/tasks/gpMgmt_check_gpdb.yml
+++ b/concourse/tasks/gpMgmt_check_gpdb.yml
@@ -4,7 +4,7 @@ image_resource:
 inputs:
   - name: gpdb_src
   - name: bin_gpdb
-  - name: sync_tools_gpdb_centos
+  - name: sync_tools_gpdb
 outputs:
 params:
   TEST_OS: ""
diff --git a/concourse/tasks/ic_gpdb.yml b/concourse/tasks/ic_gpdb.yml
index 91af330afc..65c0af1b47 100644
--- a/concourse/tasks/ic_gpdb.yml
+++ b/concourse/tasks/ic_gpdb.yml
@@ -4,7 +4,7 @@ image_resource:
 inputs:
   - name: gpdb_src
   - name: bin_gpdb
-  - name: sync_tools_gpdb_centos
+  - name: sync_tools_gpdb
 outputs:
 params:
   MAKE_TEST_COMMAND: ""
-- 
GitLab