This is an automated email from the ASF dual-hosted git repository. djwang pushed a commit to branch merge-with-upstream in repository https://gitbox.apache.org/repos/asf/cloudberry-pxf.git
commit 7815283028d7dfa980e39aedbf79bc9308c83f98 Author: Himanshu Pandey <[email protected]> AuthorDate: Thu Sep 22 16:09:50 2022 -0700 Added Python dependencies for Tinc Tests --- .../pxf/automation/components/common/DbSystemObject.java | 1 + concourse/scripts/pxf_common.bash | 7 +++++++ concourse/scripts/test.bash | 10 ++++++++++ concourse/tasks/test.yml | 2 ++ 4 files changed, 20 insertions(+) diff --git a/automation/src/main/java/org/greenplum/pxf/automation/components/common/DbSystemObject.java b/automation/src/main/java/org/greenplum/pxf/automation/components/common/DbSystemObject.java index c389ea5b..e07e2456 100755 --- a/automation/src/main/java/org/greenplum/pxf/automation/components/common/DbSystemObject.java +++ b/automation/src/main/java/org/greenplum/pxf/automation/components/common/DbSystemObject.java @@ -358,6 +358,7 @@ public abstract class DbSystemObject extends BaseSystemObject implements IDbFunc if (table != null) { tableName = table.getName(); } + // TODO : Conflict with Alex's PR need to remove later. return metaData.getTables(null, null, "%" + tableName, new String[] { "TABLE", "FOREIGN TABLE" }); } diff --git a/concourse/scripts/pxf_common.bash b/concourse/scripts/pxf_common.bash index 2f5118be..c313a32c 100755 --- a/concourse/scripts/pxf_common.bash +++ b/concourse/scripts/pxf_common.bash @@ -53,6 +53,13 @@ function inflate_dependencies() { tarballs+=(regression-tools/regression-tools.tar.gz) fi + # TODO : Conflict with Alex's PR need to remove later. + # when running automation against GP7, we need python2 dependencies shipped with gp6 to make Tinc work + # if required, these libraries will be fetched by a CI pipeline under gp6-python-libs directory + if [[ -f gp6-python-libs/gp6-python-libs.tar.gz ]]; then + tarballs+=(gp6-python-libs/gp6-python-libs.tar.gz) + fi + (( ${#tarballs[@]} == 0 )) && return for t in "${tarballs[@]}"; do tar -xzf "${t}" -C ~gpadmin diff --git a/concourse/scripts/test.bash b/concourse/scripts/test.bash index 206e323f..b2e724ed 100755 --- a/concourse/scripts/test.bash +++ b/concourse/scripts/test.bash @@ -203,6 +203,16 @@ fi inflate_dependencies + # TODO : Conflict with Alex's PR need to remove later. + # To run Tinc against GP7 we need to modify PYTHONPATH in $GPHOME/greenplum_path.sh since Tinc calls that script + # we will set PYTHONPATH to point to the set of python libs compiled with Python2 for GP6 + if [[ ${GP_VER} == 7 ]]; then + local gp6_python_libs=~gpadmin/python + echo "export PYTHONPATH=${gp6_python_libs}" >> /usr/local/greenplum-db/greenplum_path.sh + fi + + + ln -s "${PWD}/pxf_src" ~gpadmin/pxf_src # Run tests diff --git a/concourse/tasks/test.yml b/concourse/tasks/test.yml index 695470af..6f89f8c9 100644 --- a/concourse/tasks/test.yml +++ b/concourse/tasks/test.yml @@ -15,6 +15,8 @@ inputs: optional: true - name: pxf_gp7_headerfile optional: true +- name: gp6-python-libs # TODO : Conflict with Alex's PR need to remove later. + optional: true params: ACCESS_KEY_ID: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
