Revert "Add streaming e2e tests (#391)" (#392)

This reverts commit 8cfd02e.

Signed-off-by: Gary Brown <[email protected]>

.travis.yml

@@ -63,15 +63,6 @@ jobs:
       env:
       - TEST_GROUP=cassandra
 
-    - stage: build
-      name: "Run e2e streaming tests"
-      install:
-      - "./.travis/setupMinikube.sh"
-      script:
-      - "./.travis/rune2eTests.sh"
-      env:
-      - TEST_GROUP=streaming
-
     - stage: deploy
       name: "Publish latest image"
       env:

.travis/rune2eTests.sh

@@ -19,10 +19,6 @@ then
     echo "Running Cassandra Tests"
     make cassandra
     make e2e-tests-cassandra
-elif [ "${TEST_GROUP}" = "streaming" ]
-then
-    echo "Running Streaming Tests"
-    make e2e-tests-streaming
 else
     echo "Unknown TEST_GROUP [${TEST_GROUP}]"; exit 1
 fi

Makefile

@@ -14,7 +14,6 @@ VERSION_PKG ?= "github.com/jaegertracing/jaeger-operator/pkg/version"
 JAEGER_VERSION ?= "$(shell grep -v '\#' jaeger.version)"
 OPERATOR_VERSION ?= "$(shell git describe --tags)"
 STORAGE_NAMESPACE ?= "${shell kubectl get sa default -o jsonpath='{.metadata.namespace}' || oc project -q}"
-KAFKA_NAMESPACE ?= "kafka"
 ES_OPERATOR_NAMESPACE = openshift-logging
 
 LD_FLAGS ?= "-X $(VERSION_PKG).version=$(OPERATOR_VERSION) -X $(VERSION_PKG).buildDate=$(VERSION_DATE) -X $(VERSION_PKG).defaultJaeger=$(JAEGER_VERSION)"
@@ -105,11 +104,6 @@ e2e-tests-self-provisioned-es: prepare-e2e-tests deploy-es-operator
 	@echo Running Self provisioned Elasticsearch end-to-end tests...
 	@go test -tags=self_provisioned_elasticsearch ./test/e2e/... -kubeconfig $(KUBERNETES_CONFIG) -namespacedMan ../../deploy/test/namespace-manifests.yaml -globalMan ../../deploy/crds/jaegertracing_v1_jaeger_crd.yaml -root .
 
-.PHONY: e2e-tests-streaming
-e2e-tests-streaming: prepare-e2e-tests es kafka
-	@echo Running Streaming end-to-end tests...
-	@STORAGE_NAMESPACE=$(STORAGE_NAMESPACE) KAFKA_NAMESPACE=$(KAFKA_NAMESPACE) go test -tags=streaming ./test/e2e/... -kubeconfig $(KUBERNETES_CONFIG) -namespacedMan ../../deploy/test/namespace-manifests.yaml -globalMan ../../deploy/crds/jaegertracing_v1_jaeger_crd.yaml -root .
-
 .PHONY: run
 run: crd
 	@rm -rf /tmp/_cert*
@@ -143,13 +137,6 @@ storage:
 	@echo Creating namespace $(STORAGE_NAMESPACE)
 	@kubectl create namespace $(STORAGE_NAMESPACE) 2>&1 | grep -v "already exists" || true
 
-.PHONY: kafka
-kafka:
-	@echo Creating namespace $(KAFKA_NAMESPACE)
-	@kubectl create namespace $(KAFKA_NAMESPACE) 2>&1 | grep -v "already exists" || true
-	@sed 's/namespace: .*/namespace: kafka/' ./test/kafka-operator.yml | kubectl -n $(KAFKA_NAMESPACE) apply -f -  2>&1 | grep -v "already exists" || true
-	@kubectl apply -f ./test/kafka.yml -n $(KAFKA_NAMESPACE) 2>&1 | grep -v "already exists" || true
-
 .PHONY: clean
 clean:
 	@rm -f deploy/test/*.yaml 

test/e2e/utils.go

@@ -26,13 +26,12 @@ var (
 	retryInterval        = time.Second * 5
 	timeout              = time.Minute * 2
 	storageNamespace     = os.Getenv("STORAGE_NAMESPACE")
-	kafkaNamespace       = os.Getenv("KAFKA_NAMESPACE")
 	esServerUrls         = "http://elasticsearch." + storageNamespace + ".svc:9200"
 	cassandraServiceName = "cassandra." + storageNamespace + ".svc"
-	ctx                  *framework.TestCtx
-	fw                   *framework.Framework
-	namespace            string
-	t                    *testing.T
+	ctx		     *framework.TestCtx
+	fw		     *framework.Framework
+	namespace	     string
+	t		     *testing.T
 )
 
 // GetPod returns pod name
@@ -119,6 +118,7 @@ func addToFrameworkSchemeForSmokeTests(t *testing.T) {
 	}
 }
 
+
 type resp struct {
 	Data []trace `json:"data"`
 }
@@ -134,9 +134,10 @@ type span struct {
 }
 
 type services struct {
-	Data   []string    `json:"data"`
-	total  int         `json:"total"`
-	limit  int         `json:"limit"`
-	offset int         `json:offset`
+	Data []string `json:"data"`
+	total int `json:"total"`
+	limit int `json:"limit"`
+	offset int `json:offset`
 	errors interface{} `json:"errors"`
 }
+