Skip to content

Commit

Permalink
remove wheels from dev script (#50)
Browse files Browse the repository at this point in the history
Signed-off-by: Kevin Carter <kecarter@redhat.com>
  • Loading branch information
cloudnull authored May 14, 2021
1 parent 769a0d7 commit 21f1a83
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
16 changes: 3 additions & 13 deletions tools/dev-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ set -evo

VENV_PATH="${1:-/opt/directord}"
CLONE_PATH="${3:-/opt/directord-src}"
WHEEL_PATH="${WHEEL_PATH:-/opt/directord-src/dist}"
SETUP="${4:-true}"

. /etc/os-release
Expand Down Expand Up @@ -61,18 +60,9 @@ fi

${VENV_PATH}/bin/pip install --upgrade pip setuptools wheel bindep build

if [ -f "${WHEEL_PATH}" ]; then
${VENV_PATH}/bin/pip install ${WHEEL_PATH}[all]
else
if [ ! -d "${CLONE_PATH}" ]; then
git clone https://github.com/cloudnull/directord ${CLONE_PATH}
fi
${VENV_PATH}/bin/pip install ${CLONE_PATH}[all]
pushd ${CLONE_PATH}
${VENV_PATH}/bin/python3 -m build
cp dist/directord*.tar.gz /tmp/directord.tar.gz
popd
fi
rm -rf ${CLONE_PATH}
git clone https://github.com/cloudnull/directord ${CLONE_PATH}
${VENV_PATH}/bin/pip install ${CLONE_PATH}[all]

if [ "${SETUP}" = true ]; then
echo -e "\nDirectord is setup and installed within [ ${VENV_PATH} ]"
Expand Down
3 changes: 1 addition & 2 deletions tools/directord-dev-bootstrap-catalog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ directord_server:

directord_clients:
jobs:
- ADD: /tmp/directord.tar.gz directord.tar.gz
- ADD: dev-setup.sh dev-setup.sh
- RUN: sudo WHEEL_PATH=directord.tar.gz bash dev-setup.sh
- RUN: sudo bash dev-setup.sh
- RUN: >-
[[ ! -f /etc/directord/config.yaml ]] || echo "{}" | sudo tee /etc/directord/config.yaml
- RUN: sudo mkdir -p /etc/directord/private_keys /etc/directord/public_keys
Expand Down

0 comments on commit 21f1a83

Please sign in to comment.