Rearrange dir layout inside docker

Author: liamzwbao

regtests/Dockerfile

@@ -35,24 +35,24 @@ USER spark
 ENV PYTHONPATH="${SPARK_HOME}/python/:${SPARK_HOME}/python/lib/py4j-0.10.9.7-src.zip:$PYTHONPATH"
 
 # Copy and run setup.sh separately so that test sources can change, but the setup script run is still cached
-WORKDIR /home/spark/regtests
-COPY ./regtests/setup.sh /home/spark/regtests/setup.sh
-COPY ./regtests/pyspark-setup.sh /home/spark/regtests/pyspark-setup.sh
-COPY ./client/python /home/spark/regtests/client/python
-COPY ./regtests/polaris-reg-test /home/spark/polaris
+WORKDIR /home/spark/polaris
+COPY ./regtests/setup.sh /home/spark/polaris/regtests/setup.sh
+COPY ./regtests/pyspark-setup.sh /home/spark/polaris/regtests/pyspark-setup.sh
+COPY ./client/python /home/spark/polaris/client/python
+COPY ./regtests/polaris-reg-test /home/spark/polaris/polaris
 COPY ./regtests/requirements.txt /tmp/
 
-RUN python3 -m venv /home/spark/polaris-venv && \
-    . /home/spark/polaris-venv/bin/activate && \
+RUN python3 -m venv /home/spark/polaris/polaris-venv && \
+    . /home/spark/polaris/polaris-venv/bin/activate && \
     pip install -r /tmp/requirements.txt && \
     deactivate \
-    ./setup.sh
+    ./regtests/setup.sh
 
-COPY --chown=spark ./regtests /home/spark/regtests
+COPY --chown=spark ./regtests /home/spark/polaris/regtests
 
 # /home/spark/regtests might not be writable in all situations, see https://github.com/apache/polaris/pull/205
 USER root
-RUN chmod -R go+rwx /home/spark/regtests
+RUN chmod -R go+rwx /home/spark/polaris
 USER spark
 
-ENTRYPOINT ["./run.sh"]
+ENTRYPOINT ["./regtests/run.sh"]

regtests/polaris-reg-test

@@ -39,7 +39,7 @@ if [ ! -d ${SCRIPT_DIR}/polaris-venv ]; then
   . ${SCRIPT_DIR}/polaris-venv/bin/activate
   pip install -f requirements.txt
 
-  cp ${SCRIPT_DIR}/regtests/client/python/pyproject.toml ${SCRIPT_DIR}
+  cp ${SCRIPT_DIR}/client/python/pyproject.toml ${SCRIPT_DIR}
 
   # Save the current directory
   CURRENT_DIR=$(pwd)
@@ -53,7 +53,7 @@ fi
 # Save the current directory
 CURRENT_DIR=$(pwd)
 cd $SCRIPT_DIR > /dev/null
-PYTHONPATH=regtests/client/python SCRIPT_DIR="$SCRIPT_DIR" ${SCRIPT_DIR}/polaris-venv/bin/python3 regtests/client/python/cli/polaris_cli.py "$@"
+PYTHONPATH=client/python SCRIPT_DIR="$SCRIPT_DIR" ${SCRIPT_DIR}/polaris-venv/bin/python3 client/python/cli/polaris_cli.py "$@"
 status=$?
 cd $CURRENT_DIR > /dev/null
 

regtests/pyspark-setup.sh

@@ -18,14 +18,14 @@
 # under the License.
 #
 
-if [ ! -d ~/polaris-venv ]; then
-  python3 -m venv ~/polaris-venv
+if [ ! -d ~/polaris/polaris-venv ]; then
+  python3 -m venv ~/polaris/polaris-venv
 fi
 
-. ~/polaris-venv/bin/activate
+. ~/polaris/polaris-venv/bin/activate
 
 pip install -r requirements.txt
 
-cd client/python
+cd ../client/python
 python3 -m poetry install
 deactivate

regtests/run.sh

@@ -49,11 +49,11 @@ cd ${REGTEST_HOME}
 ./setup.sh
 
 # start the python venv
-. ~/polaris-venv/bin/activate
+. ~/polaris/polaris-venv/bin/activate
 
 if [ -z "${1}" ]; then
   loginfo 'Running all tests'
-  TEST_LIST="client/python/test $(find t_* -wholename '*t_*/src/*')"
+  TEST_LIST="../client/python/test $(find t_* -wholename '*t_*/src/*')"
 else
   loginfo "Running single test ${1}"
   TEST_LIST=${1}
@@ -92,7 +92,7 @@ echo "Root bearer token: ${REGTEST_ROOT_BEARER_TOKEN}"
 
 for TEST_FILE in ${TEST_LIST}; do
   # Special-case running all client pytests
-  if [ "${TEST_FILE}" == 'client/python/test' ]; then
+  if [ "${TEST_FILE}" == '../client/python/test' ]; then
     loginfo "Starting pytest for entire client suite"
     SCRIPT_DIR="$SCRIPT_DIR" python3 -m pytest ${TEST_FILE}
     CODE=$?

regtests/t_cli/src/test_cli.py

@@ -27,7 +27,7 @@
 import sys
 from typing import Callable
 
-CLI_PYTHONPATH = f'{os.path.dirname(os.path.abspath(__file__))}/../../client/python'
+CLI_PYTHONPATH = f'{os.path.dirname(os.path.abspath(__file__))}/../../../client/python'
 ROLE_ARN = 'arn:aws:iam::123456789012:role/my-role'
 POLARIS_HOST = os.getenv('POLARIS_HOST', 'localhost')
 POLARIS_URL = f'http://{POLARIS_HOST}:8181/api/catalog/v1/oauth/tokens'
@@ -46,7 +46,7 @@ def cli_inner(*args) -> Callable[[], str]:
         def f() -> str:
             result = subprocess.run([
                 'bash',
-                f'{CLI_PYTHONPATH}/../../../polaris',
+                f'{CLI_PYTHONPATH}/../../polaris',
                 '--access-token',
                 access_token,
                 '--host',