Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
d163bab5
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,发现更多精彩内容 >>
未验证
提交
d163bab5
编写于
3月 24, 2020
作者:
M
Medya Ghazizadeh
提交者:
GitHub
3月 24, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7202 from medyagh/gha_pass
adjust github actions and fix test helpers
上级
58715419
0478f2d2
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
36 addition
and
37 deletion
+36
-37
.github/workflows/main.yml
.github/workflows/main.yml
+15
-5
test/integration/aaa_download_only_test.go
test/integration/aaa_download_only_test.go
+6
-16
test/integration/addons_test.go
test/integration/addons_test.go
+2
-2
test/integration/fn_mount_cmd.go
test/integration/fn_mount_cmd.go
+1
-1
test/integration/fn_pvc.go
test/integration/fn_pvc.go
+1
-1
test/integration/fn_tunnel_cmd.go
test/integration/fn_tunnel_cmd.go
+1
-1
test/integration/functional_test.go
test/integration/functional_test.go
+1
-1
test/integration/main.go
test/integration/main.go
+5
-0
test/integration/version_upgrade_test.go
test/integration/version_upgrade_test.go
+4
-10
未找到文件。
.github/workflows/main.yml
浏览文件 @
d163bab5
...
...
@@ -113,7 +113,7 @@ jobs:
chmod a+x e2e-*
chmod a+x minikube-*
START_TIME=$(date -u +%s)
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.
5
-binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.timeout=80m -test.v -timeout-multiplier=1.
3
-binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
END_TIME=$(date -u +%s)
TIME_ELAPSED=$(($END_TIME-$START_TIME))
min=$((${TIME_ELAPSED}/60))
...
...
@@ -145,6 +145,8 @@ jobs:
echo "----------------${numFail} Failures----------------------------"
echo $STAT | jq '.FailedTests' || true
echo "-------------------------------------------------------"
numPass=$(echo $STAT | jq '.NumberOfPass')
echo "*** $numPass Passed ***"
if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
docker_ubuntu_18_04
:
runs-on
:
ubuntu-18.04
...
...
@@ -186,7 +188,7 @@ jobs:
chmod a+x e2e-*
chmod a+x minikube-*
START_TIME=$(date -u +%s)
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=
70m -test.v -timeout-multiplier=1.5
-binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.timeout=
80m -test.v -timeout-multiplier=1.3
-binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
END_TIME=$(date -u +%s)
TIME_ELAPSED=$(($END_TIME-$START_TIME))
min=$((${TIME_ELAPSED}/60))
...
...
@@ -218,6 +220,8 @@ jobs:
echo "----------------${numFail} Failures----------------------------"
echo $STAT | jq '.FailedTests' || true
echo "-------------------------------------------------------"
numPass=$(echo $STAT | jq '.NumberOfPass')
echo "*** $numPass Passed ***"
if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
none_ubuntu16_04
:
needs
:
[
build_minikube
]
...
...
@@ -254,7 +258,7 @@ jobs:
chmod a+x e2e-*
chmod a+x minikube-*
START_TIME=$(date -u +%s)
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=
7
0m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=
5
0m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
END_TIME=$(date -u +%s)
TIME_ELAPSED=$(($END_TIME-$START_TIME))
min=$((${TIME_ELAPSED}/60))
...
...
@@ -286,6 +290,8 @@ jobs:
echo "----------------${numFail} Failures----------------------------"
echo $STAT | jq '.FailedTests' || true
echo "-------------------------------------------------------"
numPass=$(echo $STAT | jq '.NumberOfPass')
echo "*** $numPass Passed ***"
if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
none_ubuntu18_04
:
needs
:
[
build_minikube
]
...
...
@@ -322,7 +328,7 @@ jobs:
chmod a+x e2e-*
chmod a+x minikube-*
START_TIME=$(date -u +%s)
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=
7
0m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=none -test.timeout=
5
0m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
END_TIME=$(date -u +%s)
TIME_ELAPSED=$(($END_TIME-$START_TIME))
min=$((${TIME_ELAPSED}/60))
...
...
@@ -354,6 +360,8 @@ jobs:
echo "----------------${numFail} Failures----------------------------"
echo $STAT | jq '.FailedTests' || true
echo "-------------------------------------------------------"
numPass=$(echo $STAT | jq '.NumberOfPass')
echo "*** $numPass Passed ***"
if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
podman_ubuntu_18_04
:
needs
:
[
build_minikube
]
...
...
@@ -400,7 +408,7 @@ jobs:
chmod a+x e2e-*
chmod a+x minikube-*
START_TIME=$(date -u +%s)
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=podman -test.timeout=70m -test.v -timeout-multiplier=1.
5
-binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome sudo -E ./e2e-linux-amd64 -minikube-start-args=--driver=podman -test.timeout=70m -test.v -timeout-multiplier=1.
3
-binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
END_TIME=$(date -u +%s)
TIME_ELAPSED=$(($END_TIME-$START_TIME))
min=$((${TIME_ELAPSED}/60))
...
...
@@ -432,6 +440,8 @@ jobs:
echo "----------------${numFail} Failures----------------------------"
echo $STAT | jq '.FailedTests' || true
echo "-------------------------------------------------------"
numPass=$(echo $STAT | jq '.NumberOfPass')
echo "*** $numPass Passed ***"
if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
# After all 4 integration tests finished
# collect all the reports and upload
...
...
test/integration/aaa_download_only_test.go
浏览文件 @
d163bab5
...
...
@@ -29,7 +29,6 @@ import (
"runtime"
"strings"
"testing"
"time"
"k8s.io/minikube/pkg/minikube/bootstrapper/images"
"k8s.io/minikube/pkg/minikube/constants"
...
...
@@ -147,16 +146,16 @@ func TestDownloadOnly(t *testing.T) {
}
}
func
TestDownloadOnly
Docker
(
t
*
testing
.
T
)
{
if
!
runningDockerDriver
(
StartArgs
()
)
{
t
.
Skip
(
"
this test only runs with the docker
driver"
)
func
TestDownloadOnly
Kic
(
t
*
testing
.
T
)
{
if
!
KicDriver
(
)
{
t
.
Skip
(
"
skipping, only for docker or podman
driver"
)
}
profile
:=
UniqueProfileName
(
"download-docker"
)
ctx
,
cancel
:=
context
.
WithTimeout
(
context
.
Background
(),
15
*
time
.
Minute
)
ctx
,
cancel
:=
context
.
WithTimeout
(
context
.
Background
(),
Minutes
(
15
)
)
defer
Cleanup
(
t
,
profile
,
cancel
)
args
:=
[]
string
{
"start"
,
"--download-only"
,
"-p"
,
profile
,
"--force"
,
"--alsologtostderr"
,
"--driver=docker"
}
args
:=
[]
string
{
"start"
,
"--download-only"
,
"-p"
,
profile
,
"--force"
,
"--alsologtostderr"
}
args
=
append
(
args
,
StartArgs
()
...
)
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
args
...
))
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v:
\n
%s"
,
args
,
err
,
rr
.
Output
())
...
...
@@ -178,12 +177,3 @@ func TestDownloadOnlyDocker(t *testing.T) {
t
.
Errorf
(
"checksum of %s does not match remote checksum (%s != %s)"
,
tarball
,
string
(
remoteChecksum
),
string
(
checksum
[
:
]))
}
}
func
runningDockerDriver
(
startArgs
[]
string
)
bool
{
for
_
,
s
:=
range
startArgs
{
if
s
==
"--driver=docker"
{
return
true
}
}
return
false
}
test/integration/addons_test.go
浏览文件 @
d163bab5
...
...
@@ -129,7 +129,7 @@ func validateIngressAddon(ctx context.Context, t *testing.T, profile string) {
return
nil
}
if
err
:=
retry
.
Expo
(
checkIngress
,
500
*
time
.
Millisecond
,
Minutes
(
1
));
err
!=
nil
{
if
err
:=
retry
.
Expo
(
checkIngress
,
500
*
time
.
Millisecond
,
Seconds
(
90
));
err
!=
nil
{
t
.
Errorf
(
"ingress never responded as expected on 127.0.0.1:80: %v"
,
err
)
}
...
...
@@ -241,7 +241,7 @@ func validateMetricsServerAddon(ctx context.Context, t *testing.T, profile strin
}
// metrics-server takes some time to be able to collect metrics
if
err
:=
retry
.
Expo
(
checkMetricsServer
,
Seconds
(
13
)
,
Minutes
(
6
));
err
!=
nil
{
if
err
:=
retry
.
Expo
(
checkMetricsServer
,
time
.
Second
*
3
,
Minutes
(
6
));
err
!=
nil
{
t
.
Errorf
(
err
.
Error
())
}
...
...
test/integration/fn_mount_cmd.go
浏览文件 @
d163bab5
...
...
@@ -106,7 +106,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) {
}
start
:=
time
.
Now
()
if
err
:=
retry
.
Expo
(
checkMount
,
time
.
Second
,
15
*
time
.
Second
);
err
!=
nil
{
if
err
:=
retry
.
Expo
(
checkMount
,
time
.
Millisecond
*
500
,
Seconds
(
15
)
);
err
!=
nil
{
// For local testing, allow macOS users to click prompt. If they don't, skip the test.
if
runtime
.
GOOS
==
"darwin"
{
t
.
Skip
(
"skipping: mount did not appear, likely because macOS requires prompt to allow non-codesigned binaries to listen on non-localhost port"
)
...
...
test/integration/fn_pvc.go
浏览文件 @
d163bab5
...
...
@@ -57,7 +57,7 @@ func validatePersistentVolumeClaim(ctx context.Context, t *testing.T, profile st
}
// Ensure the addon-manager has created the StorageClass before creating a claim, otherwise it won't be bound
if
err
:=
retry
.
Expo
(
checkStorageClass
,
time
.
Second
,
90
*
time
.
Second
);
err
!=
nil
{
if
err
:=
retry
.
Expo
(
checkStorageClass
,
time
.
Millisecond
*
500
,
Seconds
(
100
)
);
err
!=
nil
{
t
.
Errorf
(
"no default storage class after retry: %v"
,
err
)
}
...
...
test/integration/fn_tunnel_cmd.go
浏览文件 @
d163bab5
...
...
@@ -119,7 +119,7 @@ func validateTunnelCmd(ctx context.Context, t *testing.T, profile string) {
}
return
nil
}
if
err
=
retry
.
Expo
(
fetch
,
time
.
Millisecond
*
500
,
Minutes
(
2
),
6
);
err
!=
nil
{
if
err
=
retry
.
Expo
(
fetch
,
time
.
Millisecond
*
500
,
Minutes
(
2
),
13
);
err
!=
nil
{
t
.
Errorf
(
"failed to contact nginx at %s: %v"
,
nginxIP
,
err
)
}
...
...
test/integration/functional_test.go
浏览文件 @
d163bab5
...
...
@@ -725,7 +725,7 @@ func validateMySQL(ctx context.Context, t *testing.T, profile string) {
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
"kubectl"
,
"--context"
,
profile
,
"exec"
,
names
[
0
],
"--"
,
"mysql"
,
"-ppassword"
,
"-e"
,
"show databases;"
))
return
err
}
if
err
=
retry
.
Expo
(
mysql
,
5
*
time
.
Second
,
180
*
time
.
Second
);
err
!=
nil
{
if
err
=
retry
.
Expo
(
mysql
,
2
*
time
.
Second
,
Seconds
(
180
)
);
err
!=
nil
{
t
.
Errorf
(
"mysql failing: %v"
,
err
)
}
}
...
...
test/integration/main.go
浏览文件 @
d163bab5
...
...
@@ -68,6 +68,11 @@ func HyperVDriver() bool {
return
strings
.
Contains
(
*
startArgs
,
"--driver=hyperv"
)
||
strings
.
Contains
(
*
startArgs
,
"--vm-driver=hyperv"
)
}
// KicDriver returns whether or not this test is using the docker or podman driver
func
KicDriver
()
bool
{
return
strings
.
Contains
(
*
startArgs
,
"--driver=docker"
)
||
strings
.
Contains
(
*
startArgs
,
"--vm-driver=docker"
)
||
strings
.
Contains
(
*
startArgs
,
"--vm-driver=podman"
)
||
strings
.
Contains
(
*
startArgs
,
"driver=podman"
)
}
// CanCleanup returns if cleanup is allowed
func
CanCleanup
()
bool
{
return
*
cleanup
...
...
test/integration/version_upgrade_test.go
浏览文件 @
d163bab5
...
...
@@ -75,8 +75,8 @@ func TestVersionUpgrade(t *testing.T) {
return
err
}
// Retry to allow flakiness for the previous release
if
err
:=
retry
.
Expo
(
r
,
1
*
time
.
Second
,
Minutes
(
30
),
3
);
err
!=
nil
{
// Retry
up to two times,
to allow flakiness for the previous release
if
err
:=
retry
.
Expo
(
r
,
1
*
time
.
Second
,
Minutes
(
30
),
2
);
err
!=
nil
{
t
.
Fatalf
(
"release start failed: %v"
,
err
)
}
...
...
@@ -120,14 +120,8 @@ func TestVersionUpgrade(t *testing.T) {
}
args
=
append
([]
string
{
"start"
,
"-p"
,
profile
,
fmt
.
Sprintf
(
"--kubernetes-version=%s"
,
constants
.
OldestKubernetesVersion
),
"--alsologtostderr"
,
"-v=1"
},
StartArgs
()
...
)
rr
=
&
RunResult
{}
r
=
func
()
error
{
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
tf
.
Name
(),
args
...
))
return
err
}
if
err
:=
retry
.
Expo
(
r
,
1
*
time
.
Second
,
Minutes
(
30
),
3
);
err
==
nil
{
t
.
Fatalf
(
"downgrading kubernetes should not be allowed: %v"
,
err
)
if
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
tf
.
Name
(),
args
...
));
err
==
nil
{
t
.
Fatalf
(
"downgrading kubernetes should not be allowed. expected to see error but got %v for %q"
,
err
,
rr
.
Args
)
}
args
=
append
([]
string
{
"start"
,
"-p"
,
profile
,
fmt
.
Sprintf
(
"--kubernetes-version=%s"
,
constants
.
NewestKubernetesVersion
),
"--alsologtostderr"
,
"-v=1"
},
StartArgs
()
...
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录