mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #24354 from yifan-gu/fix_addon_update_test
Automatic merge from submit-queue e2e: Fix 'Addon update' to support coreos distro. cc @kubernetes/sig-testing @kubernetes/sig-node
This commit is contained in:
commit
85550921de
@ -216,6 +216,9 @@ var _ = framework.KubeDescribe("Addon update", func() {
|
|||||||
sshExecAndVerify(sshClient, "sudo TEST_ADDON_CHECK_INTERVAL_SEC=1 /etc/init.d/kube-addons restart")
|
sshExecAndVerify(sshClient, "sudo TEST_ADDON_CHECK_INTERVAL_SEC=1 /etc/init.d/kube-addons restart")
|
||||||
case "trusty":
|
case "trusty":
|
||||||
sshExecAndVerify(sshClient, "sudo initctl restart kube-addons TEST_ADDON_CHECK_INTERVAL_SEC=1")
|
sshExecAndVerify(sshClient, "sudo initctl restart kube-addons TEST_ADDON_CHECK_INTERVAL_SEC=1")
|
||||||
|
case "coreos":
|
||||||
|
sshExecAndVerify(sshClient, "sudo systemctl set-environment TEST_ADDON_CHECK_INTERVAL_SEC=1")
|
||||||
|
sshExecAndVerify(sshClient, "sudo systemctl restart kubernetes-addons")
|
||||||
default:
|
default:
|
||||||
framework.Failf("Unsupported OS distro type %s", framework.TestContext.OSDistro)
|
framework.Failf("Unsupported OS distro type %s", framework.TestContext.OSDistro)
|
||||||
}
|
}
|
||||||
@ -229,6 +232,9 @@ var _ = framework.KubeDescribe("Addon update", func() {
|
|||||||
sshExec(sshClient, "sudo /etc/init.d/kube-addons restart")
|
sshExec(sshClient, "sudo /etc/init.d/kube-addons restart")
|
||||||
case "trusty":
|
case "trusty":
|
||||||
sshExec(sshClient, "sudo initctl restart kube-addons")
|
sshExec(sshClient, "sudo initctl restart kube-addons")
|
||||||
|
case "coreos":
|
||||||
|
sshExec(sshClient, "sudo systemctl unset-environment TEST_ADDON_CHECK_INTERVAL_SEC")
|
||||||
|
sshExec(sshClient, "sudo systemctl restart kubernetes-addons")
|
||||||
default:
|
default:
|
||||||
framework.Failf("Unsupported OS distro type %s", framework.TestContext.OSDistro)
|
framework.Failf("Unsupported OS distro type %s", framework.TestContext.OSDistro)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user