diff --git a/hack/jenkins/minikube_set_pending.sh b/hack/jenkins/minikube_set_pending.sh index ba671f65827caceacc45fffc63f6d0b1b2f5c3bb..6f8a0b54f13846b35ec46d70b1347bf810ae149b 100755 --- a/hack/jenkins/minikube_set_pending.sh +++ b/hack/jenkins/minikube_set_pending.sh @@ -27,7 +27,7 @@ set -e set +x -for job in "OSX-Virtualbox" "OSX-XHyve"; do +for job in "OSX-Virtualbox" "OSX-XHyve" "OSX-Virtualbox-SystemD"; do target_url="https://storage.googleapis.com/minikube-builds/logs/${ghprbPullId}/${job}.txt" curl "https://api.github.com/repos/kubernetes/minikube/statuses/${ghprbActualCommit}?access_token=$access_token" \ -H "Content-Type: application/json" \ diff --git a/hack/jenkins/osx_integration_tests_virtualbox_systemd.sh b/hack/jenkins/osx_integration_tests_virtualbox_systemd.sh new file mode 100755 index 0000000000000000000000000000000000000000..7f684a31398b19dceab8b985332c42d5f0820c37 --- /dev/null +++ b/hack/jenkins/osx_integration_tests_virtualbox_systemd.sh @@ -0,0 +1,56 @@ +#!/bin/bash + +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# This script runs the integration tests on an OSX machine for the Virtualbox Driver + +# The script expects the following env variabls: +# MINIKUBE_LOCATION: GIT_COMMIT from upstream build. +# COMMIT: Actual commit ID from upstream build +# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests +# access_token: The Github API access token. Injected by the Jenkins credential provider. + + +set -e +chmod +x out/e2e-darwin-amd64 +chmod +x out/minikube-darwin-amd64 +cp -r out/testdata ./ + + +./out/minikube-darwin-amd64 delete || true +rm -rf $HOME/.minikube || true + +# Allow this to fail, we'll switch on the return code below. +set +e +out/e2e-darwin-amd64 -minikube-args="--vm-driver=virtualbox --cpus=4 --show-libmachine-logs --v=100 ${EXTRA_BUILD_ARGS} --iso-url=http://storage.googleapis.com/minikube/iso/buildroot/minikube-v0.0.5.iso" -test.v -test.timeout=60m -binary=out/minikube-darwin-amd64 +result=$? +set -e + +if [[ $result -eq 0 ]]; then + status="success" +else + status="failure" +fi + +set +x +target_url="https://storage.googleapis.com/minikube-builds/logs/${MINIKUBE_LOCATION}/OSX-Virtualbox-SystemD.txt" +curl "https://api.github.com/repos/kubernetes/minikube/statuses/${COMMIT}?access_token=$access_token" \ + -H "Content-Type: application/json" \ + -X POST \ + -d "{\"state\": \"$status\", \"description\": \"Jenkins\", \"target_url\": \"$target_url\", \"context\": \"OSX-VirtualBox-SystemD\"}" +set -x + +exit $result diff --git a/test/integration/docker_env_test.go b/test/integration/docker_env_test.go index ed637f25b6fbbac3d890065596c6796160cd5229..8cf5e187325aa6e1c69cfa7e6c17dada8a6de723 100644 --- a/test/integration/docker_env_test.go +++ b/test/integration/docker_env_test.go @@ -41,7 +41,8 @@ func TestDockerEnv(t *testing.T) { filename := "/var/lib/boot2docker/profile" // Figure out if it's b2d or buildroot osContents := minikubeRunner.RunCommand("ssh cat /etc/os-release", true) - if strings.Contains(osContents, "Name=Buildroot") { + t.Logf("os-release: %s", osContents) + if strings.Contains(osContents, "NAME=Buildroot") { filename = "/etc/systemd/system/docker.service" }