diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml index 1846d0fce3b9b735659714e48975ac5ae7703af6..1ffd2a5f8a05870785026a37f2c16d7945cb64c2 100644 --- a/concourse/pipelines/templates/gpdb-tpl.yml +++ b/concourse/pipelines/templates/gpdb-tpl.yml @@ -422,13 +422,6 @@ resources: json_key: ((gcs-key)) regexp: centos6/libquicklz-devel-(\d.*)\.el6\.x86_64\.rpm -- name: libsigar-centos6 - type: gcs - source: - bucket: ((pivotal-gp-internal-artifacts-gcs-bucket)) - json_key: ((gcs-key)) - regexp: centos6/sigar-rhel6_x86_64-(.*)\.targz - {% endif %} {% if "centos7" in os_types %} - name: libquicklz-centos7 @@ -445,13 +438,6 @@ resources: json_key: ((gcs-key)) regexp: centos7/libquicklz-devel-(\d.*)\.el7\.x86_64\.rpm -- name: libsigar-centos7 - type: gcs - source: - bucket: ((pivotal-gp-internal-artifacts-gcs-bucket)) - json_key: ((gcs-key)) - regexp: centos7/sigar-rhel7_x86_64-(.*)\.targz - {% endif %} {% if "centos6" in os_types %} - name: python-centos6 @@ -854,8 +840,6 @@ jobs: resource: libquicklz-centos6 - get: libquicklz-devel-installer resource: libquicklz-devel-centos6 - - get: libsigar-installer - resource: libsigar-centos6 - get: python-tarball resource: python-centos6 - task: sync_tools @@ -898,8 +882,6 @@ jobs: resource: libquicklz-centos7 - get: libquicklz-devel-installer resource: libquicklz-devel-centos7 - - get: libsigar-installer - resource: libsigar-centos7 - get: python-tarball resource: python-centos7 - task: sync_tools diff --git a/concourse/scripts/compile_gpdb.bash b/concourse/scripts/compile_gpdb.bash index 37488b9c789a64b7706ca9ef2d43e9d101511d64..9318dab1bcf7eda8008e4871988fc309114914a7 100755 --- a/concourse/scripts/compile_gpdb.bash +++ b/concourse/scripts/compile_gpdb.bash @@ -15,21 +15,18 @@ function expand_glob_ensure_exists() { echo "${glob[0]}" } -function prep_env_for_centos() { - case "${TARGET_OS_VERSION}" in - 6|7) BLD_ARCH=rhel${TARGET_OS_VERSION}_x86_64 ;; - *) echo "TARGET_OS_VERSION not set or recognized for Centos/RHEL" ; exit 1 ;; - esac -} - function install_deps_for_centos() { # quicklz is proprietary code that we cannot put in our public Docker images. 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 } +function prep_env_for_centos() { + case "${TARGET_OS_VERSION}" in + 6|7) BLD_ARCH=rhel${TARGET_OS_VERSION}_x86_64 ;; + *) echo "TARGET_OS_VERSION not set or recognized for Centos/RHEL" ; exit 1 ;; + esac +} function link_tools_for_centos() { tar xf python-tarball/python-*.tar.gz -C $(pwd)/${GPDB_SRC_PATH}/gpAux/ext @@ -164,8 +161,8 @@ function _main() { case "${TARGET_OS}" in centos) - prep_env_for_centos install_deps_for_centos + prep_env_for_centos link_tools_for_centos ;; sles) diff --git a/concourse/scripts/sync_tools.bash b/concourse/scripts/sync_tools.bash index 62f30146816b85ec9ab9842ae6f715fd2d1cee5c..9cdddd05bcb2aa2ff67cc7bb9d8d250f67036b73 100755 --- a/concourse/scripts/sync_tools.bash +++ b/concourse/scripts/sync_tools.bash @@ -38,14 +38,9 @@ function _main() { ;; esac - # We have moved out of ivy for Centos{6,7}, so make sync_tools - # will not create the necessary directory for centos. - if [ "${TARGET_OS}" = centos ]; then - mkdir -p ${GPDB_SRC_PATH}/gpAux/ext/${BLD_ARCH} - fi make_sync_tools - # Move ext directory to output dir. + # Move ext directory to output dir mv ${GPDB_SRC_PATH}/gpAux/ext gpAux_ext/ } diff --git a/concourse/tasks/compile_gpdb.yml b/concourse/tasks/compile_gpdb.yml index 0666cc58c346160604c1b19c46111b7e2269af3b..8a5f1eb08fcbbbc29e33574951f1eac7a24c9171 100644 --- a/concourse/tasks/compile_gpdb.yml +++ b/concourse/tasks/compile_gpdb.yml @@ -7,7 +7,6 @@ inputs: - name: gpAux_ext - name: libquicklz-installer - name: libquicklz-devel-installer - - name: libsigar-installer - name: python-tarball outputs: - name: gpdb_artifacts diff --git a/gpAux/releng/make/dependencies/ivy.xml b/gpAux/releng/make/dependencies/ivy.xml index 254553d89ca6d13281678a52b4f2f6461f318cd9..79177fcda01f37c5bf8468b54f855c819bf180ca 100644 --- a/gpAux/releng/make/dependencies/ivy.xml +++ b/gpAux/releng/make/dependencies/ivy.xml @@ -16,7 +16,7 @@ - +