From 1665dd72885eb04db3f8aab867f87c54df177c5b Mon Sep 17 00:00:00 2001
From: Webster Mudge <wmudge@cloudera.com>
Date: Wed, 25 Oct 2023 10:08:57 -0400
Subject: [PATCH 1/2] Pin cldr-runner to 1.7.4 and cloudera-deploy to 1.7.0;
 update ANSIBLE_COLLECTIONS_PATH override to append additional paths

Signed-off-by: Webster Mudge <wmudge@cloudera.com>
---
 quickstart.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/quickstart.sh b/quickstart.sh
index 38a95b3..c1172ce 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -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:-release/v1.7.0}"
 
 IMAGE_TAG="${PROVIDER}-${IMAGE_VER}"
 IMAGE_FULL_NAME="${IMAGE_NAME}:${IMAGE_TAG}"
@@ -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"
@@ -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

From 07f976013970e83b9660053e58559933d2e94494 Mon Sep 17 00:00:00 2001
From: Webster Mudge <wmudge@cloudera.com>
Date: Thu, 26 Oct 2023 10:09:09 -0400
Subject: [PATCH 2/2] Convert from upstream branch to tag for cloudera_deploy
 version parameter

Signed-off-by: Webster Mudge <wmudge@cloudera.com>
---
 quickstart.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstart.sh b/quickstart.sh
index c1172ce..c5e093e 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -21,7 +21,7 @@ PROVIDER="${provider:-full}"
 IMAGE_VER="${image_ver:-v1.7.4}"
 IMAGE_NO_PULL="${no_pull:+true}"
 CONTAINER_NAME="${container:-cloudera-deploy}"
-DEPLOY_VER="${deploy_ver:-release/v1.7.0}"
+DEPLOY_VER="${deploy_ver:-v1.7.1}"
 
 IMAGE_TAG="${PROVIDER}-${IMAGE_VER}"
 IMAGE_FULL_NAME="${IMAGE_NAME}:${IMAGE_TAG}"