diff --git a/regtests/Dockerfile b/regtests/Dockerfile index c41e6dcdb4..eb6c84cc06 100644 --- a/regtests/Dockerfile +++ b/regtests/Dockerfile @@ -39,7 +39,7 @@ 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 ./polaris /home/spark/polaris/polaris COPY ./regtests/requirements.txt /tmp/ RUN python3 -m venv /home/spark/polaris/polaris-venv && \ diff --git a/regtests/polaris-reg-test b/regtests/polaris-reg-test deleted file mode 100755 index bae672b53e..0000000000 --- a/regtests/polaris-reg-test +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -#################################################### -# This is a modified copy of the polaris script in # -# the parent directory, used for regression tests. # -#################################################### - -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -# Check if the current directory is 'regtests' and abort if it is -if [ $(basename ${SCRIPT_DIR}) == "regtests" ]; then - echo "This script is intended solely for regression testing and cannot be executed from within the 'regtests' directory. Please use the script from the parent directory: $(dirname ${SCRIPT_DIR})/polaris" - exit 1 -fi - -# Check if the virtual environment directory 'polaris-venv' exists. -# If it does not, perform the first-time setup for the Python client -if [ ! -d ${SCRIPT_DIR}/polaris-venv ]; then - echo "Performing first-time setup for the Python client..." - python3 -m venv ${SCRIPT_DIR}/polaris-venv - . ${SCRIPT_DIR}/polaris-venv/bin/activate - pip install -f requirements.txt - - cp ${SCRIPT_DIR}/client/python/pyproject.toml ${SCRIPT_DIR} - - # Save the current directory - CURRENT_DIR=$(pwd) - cd $SCRIPT_DIR && poetry install - cd $CURRENT_DIR - - deactivate - echo "First time setup complete." -fi - -# Save the current directory -CURRENT_DIR=$(pwd) -cd $SCRIPT_DIR > /dev/null -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 - -if [ $status -ne 0 ]; then - exit 1 -fi - -exit 0