Skip to content
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

Update quickstart.sh to pin cldr-runner and cloudera-deploy #129

Merged
merged 2 commits into from
Nov 2, 2023
Merged

Update quickstart.sh to pin cldr-runner and cloudera-deploy #129

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1665dd7
Pin cldr-runner to 1.7.4 and cloudera-deploy to 1.7.0; update ANSIBLE…
wmudge Oct 25, 2023
07f9760
Convert from upstream branch to tag for cloudera_deploy version param…
wmudge Oct 26, 2023
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
17 changes: 9 additions & 8 deletions quickstart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ set -e

IMAGE_NAME="${image_name:-ghcr.io/cloudera-labs/cldr-runner}"
PROVIDER="${provider:-full}"
IMAGE_VER="${image_ver:-latest}"
IMAGE_VER="${image_ver:-v1.7.4}"
IMAGE_NO_PULL="${no_pull:+true}"
CONTAINER_NAME="${container:-cloudera-deploy}"
DEPLOY_VER="${deploy_ver:-v1.7.1}"

IMAGE_TAG="${PROVIDER}-${IMAGE_VER}"
IMAGE_FULL_NAME="${IMAGE_NAME}:${IMAGE_TAG}"
Expand Down Expand Up @@ -58,9 +59,9 @@ fi
# If CLDR_COLLECTION_PATH is set, the default version in the container will be removed and this path added to the Ansible Collection path
# The path supplied must be relative to PROJECT_DIR, e.g. ansible_dev/collections
if [ -n "${CLDR_COLLECTION_PATH}" ]; then
echo "Path to custom Cloudera Collection supplied as ${CLDR_COLLECTION_PATH}, adding to Ansible Collection path"
ANSIBLE_COLLECTIONS_PATH="/opt/cldr-runner/collections:/runner/project/${CLDR_COLLECTION_PATH}"
QUICKSTART_PROMPT='Quickstart? Run this command -- ansible-playbook project/cloudera-deploy/main.yml -e "definition_path=examples/sandbox" -t run,default_cluster'
echo "Path to custom Cloudera Collection supplied as ${CLDR_COLLECTION_PATH}, appending to Ansible Collection path"
ANSIBLE_COLLECTIONS_PATH="/runner/project/${CLDR_COLLECTION_PATH}:/opt/cldr-runner/collections"
QUICKSTART_PROMPT='Quickstart? Run this command -- ansible-playbook /opt/cloudera-deploy/main.yml -e "definition_path=examples/sandbox" -t run,default_cluster'
else
echo "Custom Cloudera Collection path not found"
ANSIBLE_COLLECTIONS_PATH="/opt/cldr-runner/collections"
Expand Down Expand Up @@ -138,11 +139,11 @@ if [ ! "$(docker ps -q -f name=${CONTAINER_NAME})" ]; then
/usr/bin/env bash

echo "Installing the cloudera-deploy project to the execution container '${CONTAINER_NAME}'"
docker exec -td "${CONTAINER_NAME}" /usr/bin/env git clone https://github.com/cloudera-labs/cloudera-deploy.git /opt/cloudera-deploy --depth 1
docker exec -td "${CONTAINER_NAME}" /usr/bin/env git clone https://github.com/cloudera-labs/cloudera-deploy.git /opt/cloudera-deploy -b "${DEPLOY_VER}" --depth 1

if [ -n "${CLDR_COLLECTION_PATH}" ]; then
docker exec -td "${CONTAINER_NAME}" /usr/bin/env rm -rf /opt/cldr-runner/collections/ansible_collections/cloudera
fi
# if [ -n "${CLDR_COLLECTION_PATH}" ]; then
# docker exec -td "${CONTAINER_NAME}" /usr/bin/env rm -rf /opt/cldr-runner/collections/ansible_collections/cloudera
# fi
if [ -n "${CLDR_PYTHON_PATH}" ]; then
docker exec -td "${CONTAINER_NAME}" pip uninstall -y cdpy
fi
Expand Down