Skip to content

Commit

Permalink
fixes for windows
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Gartland committed Sep 12, 2023
1 parent 25f47f5 commit 236392d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
7 changes: 4 additions & 3 deletions test/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@ build-clean target:
--tag {{_tag}}-{{target}}:latest \
./docker

local_init-connect:
local_init-connect target:
#!/usr/bin/env bash
pip install -r ./setup/requirements.txt
echo "${FUZZBUCKET_SSH_KEY}" > .fuzzbucket-ssh-key
chmod 600 .fuzzbucket-ssh-key
export SSH_OPTIONS="-i.fuzzbucket-ssh-key"
export CONNECT_IP="$(python setup/connect-setup.py)"
export SSH_OPTIONS="-i.fuzzbucket-ssh-key" && \
export CONNECT_IP="$(python setup/connect-setup.py)" && \
just publishing-tests {{target}}
publishing-tests target:
#!/usr/bin/env bash
Expand Down
5 changes: 2 additions & 3 deletions test/setup/connect-setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def connect_ready(box_name, max_attempts, interval):
logging.info("Checking Connect Status")
response = requests.get("http://"+connect_box+":3939/__ping__")
if response.status_code == 200:
if latest_connect != current_connect:
if latest_connect != get_current_connect_version(get_ip(box_name), api_key):
logging.info("Installing Connect...")
subprocess.check_output(install_connect, shell=True, text=True)
return response.text
Expand All @@ -70,11 +70,10 @@ def connect_ready(box_name, max_attempts, interval):
attempts += 1
return None

response = connect_ready(box_name, 20, 5)
api_key=get_api_key('admin')
latest_connect=get_latest_connect_version()
current_connect=get_current_connect_version(get_ip(box_name), api_key)
install_connect = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@" + get_ip(box_name) + " " + ssh_options + " sudo -E UNATTENDED=1 bash installer-ci.sh " + latest_connect
response = connect_ready(box_name, 20, 5)

if response:
print(get_ip(box_name))
Expand Down

0 comments on commit 236392d

Please sign in to comment.