From 2ca7aca06e29c26480bf2447d53a1cd9252ea86a Mon Sep 17 00:00:00 2001
From: foyzur <foyzur@gmail.com>
Date: Tue, 15 Nov 2016 11:12:43 -0800
Subject: [PATCH] Fixing installer creation to support new gpaddon repository
 (#1304)

* Changing pipeline to incorporate gpaddon repository.
* Modifying pipeline to add gpaddon to packaging stage.
* Modify install script path for gpaddon.

Signed-off-by: Shoaib Lari <slari@pivotal.io>
Signed-off-by: Foyzur Rahman <foyzur@gmail.com>
Signed-off-by: Marbin Tan <mtan@pivotal.io>
---
 concourse/gpdb_packaging.yml          | 3 ++-
 concourse/pipelines/pipeline.yml      | 9 +++++++++
 concourse/scripts/compile_gpdb.bash   | 2 +-
 concourse/scripts/gpdb_packaging.bash | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/concourse/gpdb_packaging.yml b/concourse/gpdb_packaging.yml
index b531689385..748bf88249 100644
--- a/concourse/gpdb_packaging.yml
+++ b/concourse/gpdb_packaging.yml
@@ -3,12 +3,13 @@ image_resource:
   type: docker-image
 inputs:
   - name: gpdb_src
+  - name: gpaddon_src
   - name: bin_gpdb
 outputs:
   - name: packaged_gpdb
 run:
   path: gpdb_src/concourse/scripts/gpdb_packaging.bash
 params:
-  INSTALL_SCRIPT_SRC: gpdb_src/gpAux/addon/license/REPLACE_IN_PIPELINE_installer-header-foraspecificOS.sh
+  INSTALL_SCRIPT_SRC: gpaddon/license/REPLACE_IN_PIPELINE_installer-header-foraspecificOS.sh
   GPDB_TARGZ: bin_gpdb/bin_gpdb.tar.gz
   INSTALLER_ZIP: packaged_gpdb/greenplum-db-VERSION-OS-x86_64.zip
diff --git a/concourse/pipelines/pipeline.yml b/concourse/pipelines/pipeline.yml
index 235c8a1a30..d7e833ad43 100644
--- a/concourse/pipelines/pipeline.yml
+++ b/concourse/pipelines/pipeline.yml
@@ -10,6 +10,13 @@ resources:
     private_key: {{gpdb-git-key}}
     uri: {{gpdb-git-remote}}
 
+- name: gpaddon_src
+  type: git
+  source:
+    branch: {{gpaddon-git-branch}}
+    private_key: {{gpdb-git-key}}
+    uri: {{gpaddon-git-remote}}
+
 - name: centos67-gpdb-gcc6-llvm-image
   type: docker-image
   source:
@@ -389,6 +396,8 @@ jobs:
     - get: gpdb_src
       tags: ["worker-three"]
       passed: [icb_planner_centos6, icb_gporca_centos6, icb_planner_codegen_centos6, icb_gporca_codegen_centos6]
+    - get: gpaddon_src
+      tags: ["worker-three"]
     - get: bin_gpdb
       tags: ["worker-three"]
       resource: bin_gpdb_centos
diff --git a/concourse/scripts/compile_gpdb.bash b/concourse/scripts/compile_gpdb.bash
index 9b89c19459..359571f594 100755
--- a/concourse/scripts/compile_gpdb.bash
+++ b/concourse/scripts/compile_gpdb.bash
@@ -68,10 +68,10 @@ function make_sync_tools() {
     # downloaded from artifacts in order to use the native zlib.
     find ext -name 'libz.*' -exec rm -f {} \;
     tar -czf ../../sync_tools_gpdb/sync_tools_gpdb.tar.gz ext
+
   popd
 }
 
-
 function build_gpdb() {
   pushd gpdb_src/gpAux
     if [ -n "$1" ]; then
diff --git a/concourse/scripts/gpdb_packaging.bash b/concourse/scripts/gpdb_packaging.bash
index 596b3811cc..79635220bd 100755
--- a/concourse/scripts/gpdb_packaging.bash
+++ b/concourse/scripts/gpdb_packaging.bash
@@ -12,6 +12,10 @@ function echo_expected_env_variables() {
 
 function _main() {
   echo_expected_env_variables
+
+  # Copy gpaddon into addon to ensure the availability of all the installer scripts
+  cp -R gpaddon_src gpdb_src/gpAux/addon
+
   local installer_bin
   installer_bin=$( echo "$INSTALLER_ZIP" | sed "s/.zip/.bin/" | xargs basename)
 
-- 
GitLab