Skip to content

Commit

Permalink
Moving cdsw from yarndevtools: export YARNDEVTOOLS_MODULE_VERSION if …
Browse files Browse the repository at this point in the history
…YARNDEVTOOLS_BRANCH is defined in initial-cdsw-setup.sh
  • Loading branch information
szilard-nemeth committed Aug 2, 2024
1 parent 8974e44 commit 13ba2d5
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion yarndevtools/cdsw/scripts/initial-cdsw-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ SCRIPTS_ROOT="$CDSW_ROOT/scripts"
rm "$SCRIPTS_ROOT/*"
mkdir -p $CDSW_ROOT
mkdir -p $SCRIPTS_ROOT
# TODO Location of scripts will be different for CDSW
# TODO cdsw-separation Location of scripts will be different for CDSW launcher
cp $REPOS_ROOT/yarn-dev-tools/yarndevtools/cdsw/scripts/{clone_downstream_repos.sh,clone_upstream_repos.sh} $CDSW_ROOT/scripts
cp $REPOS_ROOT/yarn-dev-tools/yarndevtools/cdsw/start_job.py $CDSW_ROOT/scripts
cp -R $REPOS_ROOT/yarn-dev-tools/yarndevtools/cdsw/libreloader/ $CDSW_ROOT/scripts/libreloader
Expand Down Expand Up @@ -91,6 +91,11 @@ if [[ "$EXEC_MODE" == "cloudera" ]]; then
$CLONE_DS_REPOS_SCRIPT_PATH
fi

# YARNDEVTOOLS_MODULE_VERSION should be exported as install-requirements.sh will pick up the right version of yarndevtools and install its dependencies e.g. cdsw-job-launcher
if [[ ! -z "$YARNDEVTOOLS_BRANCH" ]]; then
export YARNDEVTOOLS_MODULE_VERSION=$(wget -q -O - https://raw.githubusercontent.com/szilard-nemeth/yarn-dev-tools/master/pyproject.toml | grep -A2 "name = \"yarn-dev-tools\"" | grep -m 1 version | tr -s ' ' | tr -d '"' | tr -d "'" | cut -d' ' -f3 )
fi

. $INSTALL_REQUIREMENTS_SCRIPT_PATH $EXEC_MODE

# =================================================================
Expand Down

0 comments on commit 13ba2d5

Please sign in to comment.