Join multiple E2E test suites in one (#1783)

* Join multiple E2E test suites in one Signed-off-by: Israel Blancas <[email protected]> * Templatize the name of the concurrency groups Signed-off-by: Israel Blancas <[email protected]> * Fix Makefile rule Signed-off-by: Israel Blancas <[email protected]> Co-authored-by: Ruben Vargas <[email protected]>
jaegertracing · Apr 6, 2022 · 431038e · 431038e
1 parent 0e2e84d
commit 431038e
Show file tree

Hide file tree

Showing 34 changed files with 34 additions and 150 deletions.
diff --git a/.github/workflows/e2e-allinone.yaml b/.github/workflows/e2e-allinone.yaml
@@ -11,7 +11,7 @@ on:
       - '**.md'
 
 concurrency:
-  group: e2e-tests-${{ github.ref }}-allinone
+  group: e2e-tests-${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/e2e-elasticsearch.yaml b/.github/workflows/e2e-elasticsearch.yaml
@@ -11,7 +11,7 @@ on:
       - '**.md'
 
 concurrency:
-  group: e2e-tests-${{ github.ref }}-elasticsearch
+  group: e2e-tests-${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/e2e-examples.yaml b/.github/workflows/e2e-examples.yaml
@@ -11,7 +11,7 @@ on:
       - '**.md'
 
 concurrency:
-  group: e2e-tests-${{ github.ref }}-examples
+  group: e2e-tests-${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/e2e-generate.yaml b/.github/workflows/e2e-generate.yaml
@@ -11,7 +11,7 @@ on:
       - '**.md'
 
 concurrency:
-  group: e2e-tests-${{ github.ref }}-generate
+  group: e2e-tests-${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/e2e-istio.yaml b/.github/workflows/e2e-istio.yaml
diff --git a/.github/workflows/e2e-cassandra.yaml → .github/workflows/e2e-miscellaneous.yaml b/.github/workflows/e2e-cassandra.yaml → .github/workflows/e2e-miscellaneous.yaml
@@ -1,4 +1,4 @@
-name: Cassandra E2E tests
+name: Miscellaneous E2E tests
 
 on:
   push:
@@ -11,24 +11,24 @@ on:
       - '**.md'
 
 concurrency:
-  group: e2e-tests-${{ github.ref }}-cassandra
+  group: e2e-tests-${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:
-  run-e2e-cassandra-test-suite:
+  run-e2e-miscellaneous-test-suite:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
        kube-version:
        - "1.19"
        - "1.23"
-    name: Run Cassandra E2E tests
+    name: Run miscellaneous E2E tests
     steps:
       - name: "Check out code into the Go module directory"
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - uses: ./hack/actions/e2e
         with:
-          testsuite_name: cassandra
+          testsuite_name: miscellaneous
           kube_version: ${{ matrix.kube-version }}
diff --git a/.github/workflows/e2e-outside-cluster.yaml b/.github/workflows/e2e-outside-cluster.yaml
diff --git a/.github/workflows/e2e-sidecar.yaml b/.github/workflows/e2e-sidecar.yaml
@@ -11,7 +11,7 @@ on:
       - '**.md'
 
 concurrency:
-  group: e2e-tests-${{ github.ref }}-sidecar
+  group: e2e-tests-${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/e2e-streaming.yaml b/.github/workflows/e2e-streaming.yaml
@@ -11,7 +11,7 @@ on:
       - '**.md'
 
 concurrency:
-  group: e2e-tests-${{ github.ref }}-streaming
+  group: e2e-tests-${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml
@@ -11,7 +11,7 @@ on:
       - '**.md'
 
 concurrency:
-  group: e2e-tests-${{ github.ref }}-upgrade
+  group: e2e-tests-${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:

diff --git a/tests/e2e/cassandra/Makefile b/tests/e2e/cassandra/Makefile
diff --git a/tests/e2e/cassandra/cassandra-smoke/02-assert.yaml b/tests/e2e/cassandra/cassandra-smoke/02-assert.yaml
diff --git a/tests/e2e/cassandra/render.sh b/tests/e2e/cassandra/render.sh
diff --git a/tests/e2e/istio/.gitignore b/tests/e2e/istio/.gitignore
diff --git a/tests/e2e/istio/Makefile b/tests/e2e/istio/Makefile
diff --git a/tests/e2e/istio/istio/.gitignore b/tests/e2e/istio/istio/.gitignore
diff --git a/tests/e2e/miscellaneous/Makefile b/tests/e2e/miscellaneous/Makefile
@@ -0,0 +1,5 @@
+render-e2e-tests-miscellaneous: set-assert-e2e-img-name load-assert-job
+	SKIP_ES_EXTERNAL=$(SKIP_ES_EXTERNAL) ./tests/e2e/miscellaneous/render.sh
+
+run-e2e-tests-miscellaneous: TEST_SUITE_NAME=miscellaneous
+run-e2e-tests-miscellaneous: run-suite-tests
diff --git a/.../cassandra/cassandra-spark/01-assert.yaml → ...cellaneous/cassandra-spark/01-assert.yaml b/.../cassandra/cassandra-spark/01-assert.yaml → ...cellaneous/cassandra-spark/01-assert.yaml
diff --git a/tests/e2e/istio/istio/00-assert.yaml → tests/e2e/miscellaneous/istio/00-assert.yaml b/tests/e2e/istio/istio/00-assert.yaml → tests/e2e/miscellaneous/istio/00-assert.yaml
diff --git a/tests/e2e/istio/istio/00-install.yaml → ...s/e2e/miscellaneous/istio/00-install.yaml b/tests/e2e/istio/istio/00-install.yaml → ...s/e2e/miscellaneous/istio/00-install.yaml
diff --git a/tests/e2e/istio/istio/01-assert.yaml → tests/e2e/miscellaneous/istio/01-assert.yaml b/tests/e2e/istio/istio/01-assert.yaml → tests/e2e/miscellaneous/istio/01-assert.yaml
diff --git a/tests/e2e/istio/istio/01-install.yaml → ...s/e2e/miscellaneous/istio/01-install.yaml b/tests/e2e/istio/istio/01-install.yaml → ...s/e2e/miscellaneous/istio/01-install.yaml
diff --git a/tests/e2e/istio/istio/02-assert.yaml → tests/e2e/miscellaneous/istio/02-assert.yaml b/tests/e2e/istio/istio/02-assert.yaml → tests/e2e/miscellaneous/istio/02-assert.yaml
diff --git a/tests/e2e/istio/istio/02-install.yaml → ...s/e2e/miscellaneous/istio/02-install.yaml b/tests/e2e/istio/istio/02-install.yaml → ...s/e2e/miscellaneous/istio/02-install.yaml
diff --git a/tests/e2e/istio/istio/03-assert.yaml → tests/e2e/miscellaneous/istio/03-assert.yaml b/tests/e2e/istio/istio/03-assert.yaml → tests/e2e/miscellaneous/istio/03-assert.yaml
diff --git a/.../e2e/istio/istio/livelinessprobe.template → ...cellaneous/istio/livelinessprobe.template b/.../e2e/istio/istio/livelinessprobe.template → ...cellaneous/istio/livelinessprobe.template
diff --git a/...istio/patch-04-find-service.yaml.template → ...istio/patch-04-find-service.yaml.template b/...istio/patch-04-find-service.yaml.template → ...istio/patch-04-find-service.yaml.template
diff --git a/...de-cluster/outside-cluster/02-assert.yaml → ...cellaneous/outside-cluster/02-assert.yaml b/...de-cluster/outside-cluster/02-assert.yaml → ...cellaneous/outside-cluster/02-assert.yaml
diff --git a/...e-cluster/outside-cluster/02-install.yaml → ...ellaneous/outside-cluster/02-install.yaml b/...e-cluster/outside-cluster/02-install.yaml → ...ellaneous/outside-cluster/02-install.yaml
diff --git a/...-cluster/03-check-collector.yaml.template → ...-cluster/03-check-collector.yaml.template b/...-cluster/03-check-collector.yaml.template → ...-cluster/03-check-collector.yaml.template
diff --git a/tests/e2e/istio/render.sh → tests/e2e/miscellaneous/render.sh b/tests/e2e/istio/render.sh → tests/e2e/miscellaneous/render.sh
@@ -2,6 +2,16 @@
 
 source $(dirname "$0")/../render-utils.sh
 
+start_test "cassandra-spark"
+# Create Cassandra instance and assert it
+render_install_cassandra "00"
+# Create the Jaeger instance
+export JAEGER_NAME=test-spark-deps
+export DEP_SCHEDULE=true
+export CASSANDRA_MODE=prod
+$GOMPLATE -f $TEMPLATES_DIR/cassandra-jaeger-install.yaml.template -o ./01-install.yaml
+
+
 if [ $IS_OPENSHIFT = true ]; then
     skip_test "istio" "Test not supported in OpenShift"
 else
@@ -23,3 +33,10 @@ else
     $YQ e -i '.spec.template.spec.containers[0].command = ["/bin/sh","-c"]' $patched_file
     $YQ e -i '.spec.template.spec.containers[0].args= ["./query && curl -sf -XPOST http://localhost:15000/quitquitquit"]' $patched_file
 fi
+
+
+start_test "outside-cluster"
+jaeger_name="my-jaeger"
+render_install_elasticsearch "00"
+render_install_jaeger "$jaeger_name" "production" "01"
+$GOMPLATE -f ./03-check-collector.yaml.template -o 03-check-collector.yaml
diff --git a/tests/e2e/outside-cluster/.gitignore b/tests/e2e/outside-cluster/.gitignore
diff --git a/tests/e2e/outside-cluster/Makefile b/tests/e2e/outside-cluster/Makefile
diff --git a/tests/e2e/outside-cluster/render.sh b/tests/e2e/outside-cluster/render.sh