From d24a80223aa0ed9d5fb580a5bd5ddbc7526cc8a5 Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Tue, 8 Sep 2020 13:21:44 -0400 Subject: [PATCH] e2e: move setup jobs for metrics test into that suite (#8842) The fabio and prometheus workloads are specific to the metrics test and aren't used by any other test suite. --- e2e/{fabio => metrics/input}/fabio.nomad | 0 e2e/{prometheus => metrics/input}/prometheus.nomad | 0 e2e/metrics/prometheus.go | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename e2e/{fabio => metrics/input}/fabio.nomad (100%) rename e2e/{prometheus => metrics/input}/prometheus.nomad (100%) diff --git a/e2e/fabio/fabio.nomad b/e2e/metrics/input/fabio.nomad similarity index 100% rename from e2e/fabio/fabio.nomad rename to e2e/metrics/input/fabio.nomad diff --git a/e2e/prometheus/prometheus.nomad b/e2e/metrics/input/prometheus.nomad similarity index 100% rename from e2e/prometheus/prometheus.nomad rename to e2e/metrics/input/prometheus.nomad diff --git a/e2e/metrics/prometheus.go b/e2e/metrics/prometheus.go index d6e25d8ea..87c9addbc 100644 --- a/e2e/metrics/prometheus.go +++ b/e2e/metrics/prometheus.go @@ -17,7 +17,7 @@ func (tc *MetricsTest) setUpPrometheus(f *framework.F) error { uuid := uuid.Generate() fabioID := "fabio" + uuid[0:8] fabioAllocs := e2eutil.RegisterAndWaitForAllocs(f.T(), tc.Nomad(), - "fabio/fabio.nomad", fabioID, "") + "input/fabio.nomad", fabioID, "") if len(fabioAllocs) < 1 { return fmt.Errorf("fabio failed to start") } @@ -36,7 +36,7 @@ func (tc *MetricsTest) setUpPrometheus(f *framework.F) error { tc.fabioAddress = fmt.Sprintf("http://%s:9999", publicIP) prometheusID := "prometheus" + uuid[0:8] prometheusAllocs := e2eutil.RegisterAndWaitForAllocs(f.T(), tc.Nomad(), - "prometheus/prometheus.nomad", prometheusID, "") + "input/prometheus.nomad", prometheusID, "") if len(prometheusAllocs) < 1 { return fmt.Errorf("prometheus failed to start") }