Merge branch 'master' of https://github.com/layer5io/learn-layer5 into addLabels

Signed-off-by: Naveen Jain <nveenjain@gmail.com>

Author: nveenjain

README.md

@@ -110,11 +110,16 @@ curl --location --request DELETE 'http://34.68.35.174:9091/metrics'
 > Note: metrics are collected only for `/call` and `/echo`.
 
 # Service Mesh Interface (SMI) Conformance
-The `learn-layer5` application serves as a sample application to validate the conformance of any service mesh with the SMI specifications. To verify SMI conformance, run Meshery and invoke the suite of SMI tests specific to the service mesh you would like to validate.
+The `learn-layer5` application serves as a sample application to validate the conformance of any service mesh with the SMI specifications. To verify SMI conformance, run Meshery and the Meshery adapter for the specific service mesh you wish to test. Invoke the suite of SMI conformance tests on the specific service mesh you would like to validate.
 
-## Testing with Meshery
-Meshery allows you to schedule tests and invoke them programmatically. Meshery will store these test results and allow you to retrieve them later.
+## Invoking conformance tests
 
+**As a Service Mesh user**
+Meshery allows you to schedule tests and invoke them programmatically. Meshery will store these test results and allow you to retrieve them later. 
+
+**As a Service Mesh maker**
+Meshery guarantees provenance of these tests and facilitates the public publicing of this suite of tests results into a versioned, public matrix of conformance status (consisting of both supported capabilities and test compliance).
+<!--
 ## Testing Manually
 
 To manually invoke SMI Conformance test for a deployed service mesh, you can apply tests from the `smi-test` directory of this repository. Execute the following command to run the smi-conformace tests:
@@ -128,7 +133,7 @@ docker build . -t meshery-smi-conformance:latest
 docker run -p 10008:10008 meshery-smi-conformance:latest
 ```
 
-<!--
+
 ```shell
 kubectl kuttl test  --skip-cluster-delete=true --start-kind=false ./smi-test
 ```

smi-conformance/Dockerfile

@@ -14,8 +14,8 @@ FROM alpine:latest
 RUN apk --no-cache add ca-certificates && mkdir /home/test-yamls && mkdir /home/test-yamls/traffic-access && mkdir /home/test-yamls/traffic-spec && mkdir /home/test-yamls/traffic-split
 COPY --from=build-img /home/meshery/** /home/
 COPY --from=build-img /go/src/github.com/layer5io/learn-layer5/smi-conformance/test-gen/test-yamls/traffic-access/** /home/test-yamls/traffic-access/
-COPY --from=build-img /go/src/github.com/layer5io/learn-layer5/smi-conformance/test-gen/test-yamls/test-split/** /home/test-yamls/traffic-split/
-COPY --from=build-img /go/src/github.com/layer5io/learn-layer5/smi-conformance/test-gen/test-yamls/test-spec/** /home/test-yamls/traffic-spec/
+COPY --from=build-img /go/src/github.com/layer5io/learn-layer5/smi-conformance/test-gen/test-yamls/traffic-split/** /home/test-yamls/traffic-split/
+COPY --from=build-img /go/src/github.com/layer5io/learn-layer5/smi-conformance/test-gen/test-yamls/traffic-spec/** /home/test-yamls/traffic-spec/
 WORKDIR /home/
 EXPOSE 10008
 CMD ["sh","-c","./smi_conformance"]

smi-conformance/test-gen/test_gen.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"testing"
+	"time"
 
 	harness "github.com/kudobuilder/kuttl/pkg/apis/testharness/v1beta1"
 	"github.com/kudobuilder/kuttl/pkg/report"
@@ -28,44 +29,43 @@ type Results struct {
 	} `json:"testcase"`
 }
 
+<<<<<<< HEAD
 func RunTest(meshConfig ServiceMesh, annotations, labels map[string]string) Results {
 	manifestDirs := []string{}
 	output := Results{}
 	results := &report.Testsuites{}
+=======
+func RunTest(meshConfig ServiceMesh, annotations map[string]string) Results {
+>>>>>>> 4ac32010a115d1a96483e11b380fbc97259d70fd
 
-	// Run all testCases
-	testToRun := ""
-	// Run only traffic-split
-	// testToRun := "traffic-split"
+	c := make(chan Results)
+	go func() {
+		manifestDirs := []string{}
+		results := &report.Testsuites{}
+		output := Results{}
 
-	startKIND := false
-	options := harness.TestSuite{}
+		// Run all testCases
+		testToRun := ""
+		// Run only traffic-split
+		// testToRun := "traffic-split"
 
-	args := []string{"./test-yamls/"}
+		startKIND := false
+		options := harness.TestSuite{}
 
-	options.TestDirs = args
-	options.Timeout = 30
-	options.Parallel = 1
-	options.TestDirs = manifestDirs
-	options.StartKIND = startKIND
-	options.SkipDelete = true
+		args := []string{"./test-yamls/"}
 
-	if options.KINDContext == "" {
-		options.KINDContext = harness.DefaultKINDContext
-	}
-
-	if len(args) != 0 {
 		options.TestDirs = args
-	}
-
-	// annotations := make(map[string]string)
-	// Namespace Injection
-	// annotations["linkerd.io/inject"] = "enabled"
-
-	serviceMeshConfObj := SMIConformance{
-		SMObj: meshConfig,
-	}
+		options.Timeout = 30
+		options.Parallel = 1
+		options.TestDirs = manifestDirs
+		options.StartKIND = startKIND
+		options.SkipDelete = true
+
+		if options.KINDContext == "" {
+			options.KINDContext = harness.DefaultKINDContext
+		}
 
+<<<<<<< HEAD
 	testHandlers := make(map[string]map[string]test.CustomTest)
 	testHandlers["traffic-access"] = serviceMeshConfObj.TrafficAccessGetTests()
 	testHandlers["traffic-spec"] = serviceMeshConfObj.TrafficSpecGetTests()
@@ -78,22 +78,52 @@ func RunTest(meshConfig ServiceMesh, annotations, labels map[string]string) Resu
 			SuiteCustomTests:     testHandlers,
 			NamespaceAnnotations: annotations,
 			NamespaceLabels:      labels,
+=======
+		if len(args) != 0 {
+			options.TestDirs = args
+>>>>>>> 4ac32010a115d1a96483e11b380fbc97259d70fd
 		}
 
-		// Runs the test using the inCluster kubeConfig (runs only when the code is running inside the pod)
-		harness.InCluster = true
-
-		s, _ := json.MarshalIndent(options, "", "  ")
-		fmt.Printf("Running integration tests with following options:\n%s\n", string(s))
-		results = harness.Run()
-		data, _ := json.Marshal(results)
-		// Results of the test
-		fmt.Printf("Results :\n%v\n", string(data))
-		err := json.Unmarshal([]byte(data), &output)
-		if err != nil {
-			fmt.Printf("Unable to unmarshal results")
+		// annotations := make(map[string]string)
+		// Namespace Injection
+		// annotations["linkerd.io/inject"] = "enabled"
+
+		serviceMeshConfObj := SMIConformance{
+			SMObj: meshConfig,
 		}
-	})
 
-	return output
+		testHandlers := make(map[string]map[string]test.CustomTest)
+		testHandlers["traffic-access"] = serviceMeshConfObj.TrafficAccessGetTests()
+		testHandlers["traffic-spec"] = serviceMeshConfObj.TrafficSpecGetTests()
+		testHandlers["traffic-split"] = serviceMeshConfObj.TrafficSplitGetTests()
+
+		testutils.RunTests("kudo", testToRun, options.Parallel, func(t *testing.T) {
+			harness := test.Harness{
+				TestSuite:            options,
+				T:                    t,
+				SuiteCustomTests:     testHandlers,
+				NamespaceAnnotations: annotations,
+			}
+
+			// Runs the test using the inCluster kubeConfig (runs only when the code is running inside the pod)
+			harness.InCluster = true
+
+			s, _ := json.MarshalIndent(options, "", "  ")
+			fmt.Printf("Running integration tests with following options:\n%s\n", string(s))
+			results = harness.Run()
+			data, _ := json.Marshal(results)
+			// Results of the test
+			fmt.Printf("Results :\n%v\n", string(data))
+			err := json.Unmarshal([]byte(data), &output)
+			if err != nil {
+				fmt.Printf("Unable to unmarshal results")
+			}
+			c <- output
+			time.Sleep(5 * time.Second)
+		})
+	}()
+	select {
+	case x := <-c:
+		return x
+	}
 }