Skip irrelevent upgrade-tests when --base-image is passed

pull/8855/head
Thomas Stromberg 2020-07-27 13:46:02 -07:00
parent f07a63cfe9
commit 6fa0bd9de6
1 changed files with 14 additions and 0 deletions

View File

@ -65,6 +65,11 @@ func legacyStartArgs() []string {
// TestRunningBinaryUpgrade does an upgrade test on a running cluster
func TestRunningBinaryUpgrade(t *testing.T) {
// not supported till v1.10, and passing new images to old releases isn't supported anyways
if strings.Contains(*startArgs, "base-image") {
t.Skipf("Skipping, test does not make sense with --base-image")
}
MaybeParallel(t)
profile := UniqueProfileName("running-upgrade")
ctx, cancel := context.WithTimeout(context.Background(), Minutes(55))
@ -105,6 +110,10 @@ func TestRunningBinaryUpgrade(t *testing.T) {
// TestStoppedBinaryUpgrade does an upgrade test on a stopped cluster
func TestStoppedBinaryUpgrade(t *testing.T) {
// not supported till v1.10, and passing new images to old releases isn't supported anyways
if strings.Contains(*startArgs, "base-image") {
t.Skipf("Skipping, test does not make sense with --base-image")
}
MaybeParallel(t)
profile := UniqueProfileName("stopped-upgrade")
@ -225,6 +234,11 @@ func TestMissingContainerUpgrade(t *testing.T) {
t.Skipf("This test is only for Docker")
}
// not supported till v1.10, and passing new images to old releases isn't supported anyways
if strings.Contains(*startArgs, "base-image") {
t.Skipf("Skipping, test does not make sense with --base-image")
}
MaybeParallel(t)
profile := UniqueProfileName("missing-upgrade")
ctx, cancel := context.WithTimeout(context.Background(), Minutes(55))