Randomize Galley ports for integration testing (istio#11285)

* Randomize Galley port for code-coverage runs.

* Remove runaway empty test.

Author: ozevren

codecov.skip

@@ -15,7 +15,6 @@ istio.io/istio/tests/codecov
 istio.io/istio/tests/e2e
 istio.io/istio/tests/integration2/examples
 istio.io/istio/tests/integration2/qualification
-istio.io/istio/tests/integration2
 istio.io/istio/tests/integration_old
 istio.io/istio/tests/local
 istio.io/istio/tests/util

galley/pkg/server/server.go

@@ -252,6 +252,14 @@ func (s *Server) Run() {
 	}
 }
 
+// Address returns the Address of the MCP service.
+func (s *Server) Address() net.Addr {
+	if s.listener == nil {
+		return nil
+	}
+	return s.listener.Addr()
+}
+
 // Close cleans up resources used by the server.
 func (s *Server) Close() error {
 	if s.stopCh != nil {
@@ -273,6 +281,7 @@ func (s *Server) Close() error {
 
 	if s.listener != nil {
 		_ = s.listener.Close()
+		s.listener = nil
 	}
 
 	if s.reporter != nil {

galley/pkg/server/server_test.go

@@ -147,6 +147,12 @@ func TestServer_Basic(t *testing.T) {
 		t.Fatalf("Unexpected error creating service: %v", err)
 	}
 
+	// ensure that it does not crash
+	addr := s.Address()
+	if addr == nil {
+		t.Fatalf("expected address not found")
+	}
+
 	var wg sync.WaitGroup
 	wg.Add(1)
 
@@ -157,4 +163,10 @@ func TestServer_Basic(t *testing.T) {
 
 	wg.Wait()
 	_ = s.Close()
+
+	// ensure that it does not crash
+	addr = s.Address()
+	if addr != nil {
+		t.Fatalf("unexpected address found")
+	}
 }

pkg/test/framework/runtime/components/galley/native.go

@@ -16,24 +16,22 @@ package galley
 
 import (
 	"fmt"
+	"io"
 	"io/ioutil"
 	"os"
 	"path"
-
-	"io"
 	"time"
 
 	multierror "github.com/hashicorp/go-multierror"
 
 	"istio.io/istio/galley/pkg/server"
-	"istio.io/istio/pkg/test/scopes"
-
 	"istio.io/istio/pkg/test/framework/api/component"
 	"istio.io/istio/pkg/test/framework/api/components"
 	"istio.io/istio/pkg/test/framework/api/context"
 	"istio.io/istio/pkg/test/framework/api/descriptors"
 	"istio.io/istio/pkg/test/framework/api/lifecycle"
 	"istio.io/istio/pkg/test/framework/runtime/api"
+	"istio.io/istio/pkg/test/scopes"
 )
 
 var (
@@ -176,7 +174,13 @@ func (c *nativeComponent) restart() error {
 	a.DisableResourceReadyCheck = true
 	a.ConfigPath = c.configDir
 	a.MeshConfigFile = c.meshConfigFile
+	// To prevent ctrlZ port collision between galley/pilot&mixer
+	a.IntrospectionOptions.Port = 0
 	a.ExcludedResourceKinds = make([]string, 0)
+
+	// Bind to an arbitrary port.
+	a.APIAddress = "tcp://0.0.0.0:0"
+
 	s, err := server.New(a)
 	if err != nil {
 		scopes.Framework.Errorf("Error starting Galley: %v", err)
@@ -188,7 +192,7 @@ func (c *nativeComponent) restart() error {
 	go s.Run()
 
 	c.client = &client{
-		address: a.APIAddress,
+		address: fmt.Sprintf("tcp://%s", s.Address().String()),
 		ctx:     c.ctx,
 	}