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

Revert "fix ci machine for docker on macos" #7692

Closed
wants to merge 1 commit into from
Closed

Revert "fix ci machine for docker on macos" #7692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Empty file removed default.profraw
View file
Open in desktop
Empty file.
9 changes: 2 additions & 7 deletions hack/jenkins/osx_integration_tests_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,8 @@ EXTRA_START_ARGS=""
EXPECTED_DEFAULT_DRIVER="hyperkit"


# fix mac os as a service on mac os
# https://github.com/docker/for-mac/issues/882#issuecomment-506372814
osascript -e 'quit app "Docker"';
sudo /Applications/Docker.app/Contents/MacOS/Docker --quit-after-install --unattended || true
# repeating without sudo because https://github.com/docker/for-mac/issues/882#issuecomment-516946766
/Applications/Docker.app/Contents/MacOS/Docker --quit-after-install --unattended || true
osascript -e 'quit app "Docker"'; /Applications/Docker.app/Contents/MacOS/Docker --unattended &; while [ -z "$(docker info 2> /dev/null )" ]; do printf "."; sleep 1; done; echo "" || true
# restart docker on mac for a fresh test
osascript -e 'quit app "Docker"'; open -a Docker ; while [ -z "$(docker info 2> /dev/null )" ]; do printf "."; sleep 1; done; echo "" || true

mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
install cron/cleanup_and_reboot_Darwin.sh $HOME/cleanup_and_reboot.sh || echo "FAILED TO INSTALL CLEANUP"
Expand Down