Fix import paths for upgrade tests in ingress-controller-e2e test suite; deleted neg and psc upgrade tests references

Author: rino-gaelico

cmd/ingress-controller-e2e-test/upgrade_test.go

@@ -20,21 +20,14 @@ import (
 	"testing"
 
 	upgrade "k8s.io/ingress-gce/cmd/ingress-controller-e2e-test/upgrade"
-	negupgrade "k8s.io/ingress-gce/cmd/neg-e2e-test/upgrade"
-	pscupgrade "k8s.io/ingress-gce/cmd/psc-e2e-test/upgrade"
 	"k8s.io/ingress-gce/pkg/e2e"
 )
 
 func TestGenericUpgrade(t *testing.T) {
 	t.Parallel()
 
-	for _, test := range []e2e.UpgradeTest{
-		upgrade.NewBasicHTTPUpgradeTest(),
-		negupgrade.NewStandaloneNEGWithSvcNEGUpgradeTest(),
-	} {
-		test := test // Capture test as we are running this in parallel.
-		runUpgradeTest(t, test)
-	}
+	// Only run the Ingress-related upgrade test.
+	runUpgradeTest(t, upgrade.NewBasicHTTPUpgradeTest())
 }
 
 // TestUpgradeToV1dot7 runs upgrade tests for features that are introduced in v1.7.0.
@@ -49,12 +42,6 @@ func TestUpgradeToV1dot8(t *testing.T) {
 	runUpgradeTest(t, upgrade.NewV2FrontendNamerTest())
 }
 
-// TestUpgradeToV1dot15 runs upgrade tests for features that are introduced in v1.15.0.
-// Note that this test runs only when an upgrade results in enabling these features.
-func TestUpgradeToV1dot15(t *testing.T) {
-	runUpgradeTest(t, pscupgrade.NewPSCUpgradeTest())
-}
-
 func runUpgradeTest(t *testing.T, test e2e.UpgradeTest) {
 	desc := test.Name()
 	Framework.RunWithSandbox(desc, t, func(t *testing.T, s *e2e.Sandbox) {