simplify code a bit
parent
a4c7e5b6dc
commit
2620012bed
|
@ -76,11 +76,9 @@ function retry_github_status() {
|
|||
}
|
||||
|
||||
if [ "$(uname)" = "Darwin" ]; then
|
||||
bash setup_docker_desktop_macos.sh
|
||||
ec=$?
|
||||
if [ $ec -gt 0 ]; then
|
||||
if ! bash setup_docker_desktop_macos.sh; then
|
||||
retry_github_status "${COMMIT}" "${JOB_NAME}" "failure" "${access_token}" "${public_log_url}" "Jenkins: docker failed to start"
|
||||
exit $ec
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
@ -14,6 +14,8 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
set -x
|
||||
|
||||
# kill docker first
|
||||
osascript -e 'quit app "Docker"'
|
||||
|
||||
|
@ -34,4 +36,3 @@ do
|
|||
done
|
||||
|
||||
echo "Docker Desktop started!"
|
||||
exit 0
|
||||
|
|
Loading…
Reference in New Issue