Skip to content

Fix polaris cli initialization #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 20, 2024
Merged

Fix polaris cli initialization #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
575153d
Fix polaris cli initialization
MonkeyCanCode Aug 13, 2024
cd9edb1
Trigger Build
MonkeyCanCode Aug 15, 2024
0f99775
Add check for polaris cli when running within regtests
MonkeyCanCode Aug 17, 2024
98100cb
Merge branch 'main' into fix_polaris_cli
MonkeyCanCode Aug 17, 2024
810640b
Add comment
MonkeyCanCode Aug 17, 2024
f6ec6fe
Reverted changes on test_cli.py
MonkeyCanCode Aug 17, 2024
2bb3122
Rename polaris to polaris-reg-test under regtests dir
MonkeyCanCode Aug 19, 2024
29acca5
Match polaris-reg-test to polaris script
MonkeyCanCode Aug 20, 2024
e39822b
Revert changes on polaris-reg-test
MonkeyCanCode Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion regtests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ WORKDIR /home/spark/regtests
COPY ./setup.sh /home/spark/regtests/setup.sh
COPY ./pyspark-setup.sh /home/spark/regtests/pyspark-setup.sh
COPY ./client/python /home/spark/regtests/client/python
COPY ./polaris /home/spark
COPY ./polaris-reg-test /home/spark/polaris

RUN python3 -m venv /home/spark/polaris-venv && \
. /home/spark/polaris-venv/bin/activate && \
Expand Down
18 changes: 13 additions & 5 deletions regtests/polaris → regtests/polaris-reg-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,21 @@
# limitations under the License.
#

################################################
# This is a modified copy of the script in the #
# parent directory, used for regression tests. #
################################################
####################################################
# 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
Expand Down Expand Up @@ -50,4 +58,4 @@ if [ $status -ne 0 ]; then
exit 1
fi

exit 0
exit 0