Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
57919348
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
57919348
编写于
10月 31, 2016
作者:
D
dlorenc
提交者:
GitHub
10月 31, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #761 from dlorenc/isotest
Add an integration run with the new ISO.
上级
be7d1cba
8d1da576
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
59 addition
and
2 deletion
+59
-2
hack/jenkins/minikube_set_pending.sh
hack/jenkins/minikube_set_pending.sh
+1
-1
hack/jenkins/osx_integration_tests_virtualbox_systemd.sh
hack/jenkins/osx_integration_tests_virtualbox_systemd.sh
+56
-0
test/integration/docker_env_test.go
test/integration/docker_env_test.go
+2
-1
未找到文件。
hack/jenkins/minikube_set_pending.sh
浏览文件 @
57919348
...
...
@@ -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"
\
...
...
hack/jenkins/osx_integration_tests_virtualbox_systemd.sh
0 → 100755
浏览文件 @
57919348
#!/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
test/integration/docker_env_test.go
浏览文件 @
57919348
...
...
@@ -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"
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录