From 4361243bc000eadfab2e5cc497a952fea7a8293f Mon Sep 17 00:00:00 2001 From: Yash Sharma Date: Mon, 1 Mar 2021 18:55:24 +0530 Subject: [PATCH] removed entry for receive test for e2e Signed-off-by: Yash Sharma --- test/e2e/e2ethanos/services.go | 14 ++++++-------- test/e2e/query_test.go | 13 ------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/test/e2e/e2ethanos/services.go b/test/e2e/e2ethanos/services.go index 99bb77e381..fc301ac9db 100644 --- a/test/e2e/e2ethanos/services.go +++ b/test/e2e/e2ethanos/services.go @@ -279,14 +279,12 @@ func NewReceiveRouter(sharedDir string, networkName string, name string, replica DefaultImage(), // TODO(bwplotka): BuildArgs should be interface. e2e.NewCommand("receive-route", e2e.BuildArgs(map[string]string{ - "--debug.name": fmt.Sprintf("receive-route-%v", name), - "--http-address": ":8080", - "--remote-write.address": ":8081", - "--label": fmt.Sprintf(`receive="%s"`, name), - "--tsdb.path": filepath.Join(container, "data"), - "--log.level": infoLogLevel, - "--receive.replication-factor": strconv.Itoa(replicationFactor), - "--receive.hashrings-file": filepath.Join(container, "hashrings.json"), + "--debug.name": fmt.Sprintf("receive-route-%v", name), + "--http-address": ":8080", + "--remote-write.address": ":8081", + "--log.level": infoLogLevel, + "--receive.replication-factor": strconv.Itoa(replicationFactor), + "--receive.hashrings-file": filepath.Join(container, "hashrings.json"), "--receive.hashrings-file-refresh-interval": "5s", })...), e2e.NewHTTPReadinessProbe(8080, "/-/ready", 200, 200), diff --git a/test/e2e/query_test.go b/test/e2e/query_test.go index 0c41648acb..ea28b25565 100644 --- a/test/e2e/query_test.go +++ b/test/e2e/query_test.go @@ -125,13 +125,6 @@ func TestQuery(t *testing.T) { "prometheus": "prom-alone", "replica": "0", }, - { - "job": "myself", - "prometheus": "prom-both-remote-write-and-sidecar", - "receive": "1", - "replica": "1234", - "tenant_id": "default-tenant", - }, { "job": "myself", "prometheus": "prom-both-remote-write-and-sidecar", @@ -157,12 +150,6 @@ func TestQuery(t *testing.T) { "job": "myself", "prometheus": "prom-alone", }, - { - "job": "myself", - "prometheus": "prom-both-remote-write-and-sidecar", - "receive": "1", - "tenant_id": "default-tenant", - }, { "job": "myself", "prometheus": "prom-both-remote-write-and-sidecar",