Partial revert ic-proxy: enable ic-proxy in gpdb packages

The libuv source is in the build container, rather thank in a gcp
bucket. This commit is a partial revert from getting source from a
gcp bucket and instead uses the libuv available in the build
container image.
Co-authored-by: NTyler Ramer <tramer@vmware.com>
Co-authored-by: NKris Macoskey <kmacoskey@vmware.com>
Co-authored-by: NJamie McAtamney <jmcatamney@vmware.com>

(cherry picked from commit 88d7d969)

concourse/pipelines/gpdb_6X_STABLE-generated.yml

@@ -490,13 +490,6 @@ resources:
     json_key: ((concourse-gcs-resources-service-account-key))
     regexp: gp-internal-artifacts/centos6/sigar-rhel6_x86_64-(1\.6\.5-.*).targz
 
-- name: libuv-centos6
-  type: gcs
-  source:
-    bucket: ((gcs-bucket))
-    json_key: ((concourse-gcs-resources-service-account-key))
-    regexp: gp-internal-artifacts/centos6/libuv-(1\.38\.0.*).tar.gz
-
 - name: libquicklz-centos7
   type: gcs
   source:
@@ -518,13 +511,6 @@ resources:
     json_key: ((concourse-gcs-resources-service-account-key))
     regexp: gp-internal-artifacts/centos7/sigar-rhel7_x86_64-(1\.6\.5-.*).targz
 
-- name: libuv-centos7
-  type: gcs
-  source:
-    bucket: ((gcs-bucket))
-    json_key: ((concourse-gcs-resources-service-account-key))
-    regexp: gp-internal-artifacts/centos7/libuv-(1\.38\.0.*).tar.gz
-
 - name: libquicklz-ubuntu18.04
   type: gcs
   source:
@@ -532,13 +518,6 @@ resources:
     json_key: ((concourse-gcs-resources-service-account-key))
     regexp: gp-internal-artifacts/ubuntu18.04/libquicklz-dev_(1\.5\.0-.*)-1_amd64.deb
 
-- name: libuv-ubuntu18.04
-  type: gcs
-  source:
-    bucket: ((gcs-bucket))
-    json_key: ((concourse-gcs-resources-service-account-key))
-    regexp: gp-internal-artifacts/ubuntu18.04/libuv-(1\.38\.0.*).tar.gz
-
 - name: python-centos6
   type: gcs
   source:
@@ -891,8 +870,6 @@ jobs:
         resource: libsigar-centos6
       - get: python-tarball
         resource: python-centos6
-      - get: libuv-installer
-        resource: libuv-centos6
   - task: compile_gpdb
     file: gpdb_src/concourse/tasks/compile_gpdb.yml
     image: gpdb6-centos6-build
@@ -928,8 +905,6 @@ jobs:
         resource: libsigar-centos7
       - get: python-tarball
         resource: python-centos7
-      - get: libuv-installer
-        resource: libuv-centos7
   - task: compile_gpdb
     image: gpdb6-centos7-build
     file: gpdb_src/concourse/tasks/compile_gpdb.yml
@@ -979,8 +954,6 @@ jobs:
           resource: libquicklz-ubuntu18.04
         - get: python-tarball
           resource: python-ubuntu18.04
-        - get: libuv-installer
-          resource: libuv-ubuntu18.04
     - task: compile_gpdb
       image: gpdb6-ubuntu18.04-build
       file: gpdb_src/concourse/tasks/compile_gpdb.yml

concourse/pipelines/templates/gpdb-tpl.yml

@@ -559,13 +559,6 @@ resources:
     json_key: ((concourse-gcs-resources-service-account-key))
     regexp: gp-internal-artifacts/centos6/sigar-rhel6_x86_64-(1\.6\.5-.*).targz
 
-- name: libuv-centos6
-  type: gcs
-  source:
-    bucket: ((gcs-bucket))
-    json_key: ((concourse-gcs-resources-service-account-key))
-    regexp: gp-internal-artifacts/centos6/libuv-(1\.38\.0.*).tar.gz
-
 {% endif %}
 {% if "centos7" in os_types %}
 - name: libquicklz-centos7
@@ -589,13 +582,6 @@ resources:
     json_key: ((concourse-gcs-resources-service-account-key))
     regexp: gp-internal-artifacts/centos7/sigar-rhel7_x86_64-(1\.6\.5-.*).targz
 
-- name: libuv-centos7
-  type: gcs
-  source:
-    bucket: ((gcs-bucket))
-    json_key: ((concourse-gcs-resources-service-account-key))
-    regexp: gp-internal-artifacts/centos7/libuv-(1\.38\.0.*).tar.gz
-
 {% endif %}
 {% if "ubuntu18.04" in os_types %}
 - name: libquicklz-ubuntu18.04
@@ -605,13 +591,6 @@ resources:
     json_key: ((concourse-gcs-resources-service-account-key))
     regexp: gp-internal-artifacts/ubuntu18.04/libquicklz-dev_(1\.5\.0-.*)-1_amd64.deb
 
-- name: libuv-ubuntu18.04
-  type: gcs
-  source:
-    bucket: ((gcs-bucket))
-    json_key: ((concourse-gcs-resources-service-account-key))
-    regexp: gp-internal-artifacts/ubuntu18.04/libuv-(1\.38\.0.*).tar.gz
-
 {% endif %}
 {% if "centos6" in os_types %}
 - name: python-centos6
@@ -1000,8 +979,6 @@ jobs:
         resource: libsigar-centos6
       - get: python-tarball
         resource: python-centos6
-      - get: libuv-installer
-        resource: libuv-centos6
   - task: compile_gpdb
     file: gpdb_src/concourse/tasks/compile_gpdb.yml
     image: gpdb6-centos6-build
@@ -1039,8 +1016,6 @@ jobs:
         resource: libsigar-centos7
       - get: python-tarball
         resource: python-centos7
-      - get: libuv-installer
-        resource: libuv-centos7
   - task: compile_gpdb
     image: gpdb6-centos7-build
     file: gpdb_src/concourse/tasks/compile_gpdb.yml
@@ -1094,8 +1069,6 @@ jobs:
           resource: libquicklz-ubuntu18.04
         - get: python-tarball
           resource: python-ubuntu18.04
-        - get: libuv-installer
-          resource: libuv-ubuntu18.04
     - task: compile_gpdb
       image: gpdb6-ubuntu18.04-build
       file: gpdb_src/concourse/tasks/compile_gpdb.yml

concourse/scripts/compile_gpdb.bash

@@ -57,25 +57,21 @@ function install_libuv() {
     ubuntu) libdir=/usr/lib/x86_64-linux-gnu ;;
     *) return ;;
   esac
-
-  tar xf libuv-installer/libuv-*.tar.gz -C /tmp
-
-  mkdir -p ${includedir} ${libdir}
-  cp -a /tmp/libuv-*/include/* ${includedir}/
-  cp -a /tmp/libuv-*/lib/* ${libdir}/
+  # provided by build container
+  cp -a /usr/local/include/uv* ${includedir}/
+  cp -a /usr/local/lib/libuv* ${libdir}/
 }
 
+
 function install_deps_for_centos_or_sles() {
   rpm -i libquicklz-installer/libquicklz-*.rpm
   rpm -i libquicklz-devel-installer/libquicklz-*.rpm
   # install libsigar from tar.gz
   tar zxf libsigar-installer/sigar-*.targz -C gpdb_src/gpAux/ext
-  install_libuv
 }
 
 function install_deps_for_ubuntu() {
   dpkg --install libquicklz-installer/libquicklz-*.deb
-  install_libuv
 }
 
 function install_deps() {
@@ -83,6 +79,7 @@ function install_deps() {
     centos | sles) install_deps_for_centos_or_sles;;
     ubuntu) install_deps_for_ubuntu;;
   esac
+  install_libuv
 }
 
 function link_python() {

concourse/tasks/compile_gpdb.yml

@@ -9,7 +9,6 @@ inputs:
   - name: libsigar-installer
     optional: true
   - name: python-tarball
-  - name: libuv-installer
 outputs:
   - name: gpdb_artifacts
 run: