Merge pull request #11927 from wojtek-t/remove_shell_services

hack/lib/golang.sh

@@ -87,7 +87,6 @@ readonly KUBE_TEST_PORTABLE=(
   contrib/for-tests/network-tester/rc.json
   contrib/for-tests/network-tester/service.json
   hack/e2e.go
-  hack/e2e-suite
   hack/e2e-internal
   hack/ginkgo-e2e.sh
   hack/lib

pkg/kubectl/resource_printer_test.go

@@ -414,8 +414,7 @@ func TestTemplateStrings(t *testing.T) {
 			"true",
 		},
 	}
-	// The point of this test is to verify that the below template works. If you change this
-	// template, you need to update hack/e2e-suite/update.sh.
+	// The point of this test is to verify that the below template works.
 	tmpl := `{{if (exists . "status" "containerStatuses")}}{{range .status.containerStatuses}}{{if (and (eq .name "foo") (exists . "state" "running"))}}true{{end}}{{end}}{{end}}`
 	p, err := NewTemplatePrinter([]byte(tmpl))
 	if err != nil {

test/e2e/shell.go

-/*
-Copyright 2015 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.
-*/
-
-package e2e
-
-import (
-	"bytes"
-	"fmt"
-	"os/exec"
-	"path/filepath"
-
-	. "github.com/onsi/ginkgo"
-)
-
-var _ = Describe("Shell", func() {
-	It("should pass tests for services.sh", func() {
-		// This test requires:
-		// - SSH
-		// - master access
-		// ... so the provider check should be identical to the intersection of
-		// providers that provide those capabilities.
-		SkipUnlessProviderIs("gce")
-		runCmdTest(filepath.Join(testContext.RepoRoot, "hack/e2e-suite/services.sh"))
-	})
-})
-
-// Runs the given cmd test.
-func runCmdTest(path string) {
-	By(fmt.Sprintf("Running %v", path))
-	cmd := exec.Command(path)
-	cmd.Stdout = bytes.NewBuffer(nil)
-	cmd.Stderr = cmd.Stdout
-
-	if err := cmd.Run(); err != nil {
-		Fail(fmt.Sprintf("Error running %v:\nCommand output:\n%v\n", cmd, cmd.Stdout))
-	}
-}