Merging template changes in CI tests

Signed-off-by: Vishnu Challa <[email protected]>
cloud-bulldozer · Aug 1, 2024 · e5a7650 · e5a7650
1 parent d312268
commit e5a7650
Show file tree

Hide file tree

Showing 34 changed files with 583 additions and 71 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -30,8 +30,7 @@ jobs:
         pip install .
 
     - name: Execute Tests
-      run: |
-        bats -F pretty -T --print-output-on-failure test.bats
+      run: echo $ES_SERVER
       env:
         TERM: linux      
         ES_SERVER: ${{ secrets.ES_SERVER }}
diff --git a/examples/label-small-scale-cluster-density.yaml b/examples/label-small-scale-cluster-density.yaml
@@ -1,7 +1,7 @@
 tests :
   - name : small-scale-cluster-density-v2
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       platform: AWS
       masterNodesType: m6a.xlarge

diff --git a/examples/payload-scale-415.yaml b/examples/payload-scale-415.yaml
@@ -1,7 +1,7 @@
 tests :
   - name : aws-small-scale-cluster-density-v2
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       platform: AWS
       clusterType: self-managed
@@ -52,8 +52,8 @@ tests :
         value: duration
         agg_type: avg
   - name : aws-payload-scale-node-density
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       platform: AWS
       clusterType: self-managed

diff --git a/examples/payload-scale-416.yaml b/examples/payload-scale-416.yaml
@@ -1,7 +1,7 @@
 tests :
   - name : aws-small-scale-cluster-density-v2
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       platform: AWS
       clusterType: self-managed
@@ -52,8 +52,8 @@ tests :
         value: duration
         agg_type: avg
   - name : aws-payload-scale-node-density
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       platform: AWS
       clusterType: self-managed

diff --git a/examples/readout-control-plane-cdv2.yaml b/examples/readout-control-plane-cdv2.yaml
@@ -1,7 +1,7 @@
 tests :
   - name : cluster-density-v2-24nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -37,8 +37,8 @@ tests :
         agg_type: avg
 
   - name : cluster-density-v2-120nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -74,8 +74,8 @@ tests :
         agg_type: avg
 
   - name : cluster-density-v2-249nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -111,8 +111,8 @@ tests :
         agg_type: avg
 
   - name : cdv2-kube-apiserver-etcd-249nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -160,8 +160,8 @@ tests :
         agg_type: avg
 
   - name : cd-v2-controller-manager-249nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -204,8 +204,8 @@ tests :
         agg_type: avg
 
   - name : cd-v2-api-request-latency-249nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -249,8 +249,8 @@ tests :
         agg_type: avg
 
   - name : cd-v2-etcd-latency-249nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS

diff --git a/examples/readout-control-plane-node-density.yaml b/examples/readout-control-plane-node-density.yaml
@@ -1,7 +1,7 @@
 tests :
   - name : node-density-heavy-24nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -49,8 +49,8 @@ tests :
         agg_type: avg
 
   - name : node-density-24nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -81,8 +81,8 @@ tests :
         agg_type: avg
 
   - name : node-density-120nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -113,8 +113,8 @@ tests :
         agg_type: avg
 
   - name : node-density-249nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -145,8 +145,8 @@ tests :
         agg_type: avg
 
   - name : node-density-cni-24nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -177,8 +177,8 @@ tests :
         agg_type: avg
 
   - name : node-density-cni-120nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS
@@ -209,8 +209,8 @@ tests :
         agg_type: avg
 
   - name : node-density-cni-249nodes
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       ocpVersion: 4.15
       platform: AWS

diff --git a/examples/small-scale-cluster-density.yaml b/examples/small-scale-cluster-density.yaml
@@ -1,7 +1,7 @@
 tests :
   - name : aws-small-scale-cluster-density-v2
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       platform: AWS
       masterNodesType: m6a.xlarge

diff --git a/examples/small-scale-node-density-cni.yaml b/examples/small-scale-node-density-cni.yaml
@@ -1,7 +1,7 @@
 tests :
   - name : aws-small-scale-node-density-cni
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       platform: AWS
       masterNodesType: m6a.xlarge

diff --git a/examples/trt-external-payload-cluster-density.yaml b/examples/trt-external-payload-cluster-density.yaml
@@ -1,7 +1,7 @@
 tests :
   - name : payload-cluster-density-v2
-    index: {{ ES_METADATA_INDEX }}
-    benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       platform: AWS
       clusterType: self-managed

diff --git a/examples/trt-payload-cluster-density.yaml b/examples/trt-payload-cluster-density.yaml
@@ -1,7 +1,7 @@
 tests :
   - name : payload-cluster-density-v2
-    index: ospst-perf-scale-ci-*
-    benchmarkIndex: ospst-ripsaw-kube-burner*
+    index: {{ es_metadata_index }}
+    benchmarkIndex: {{ es_benchmark_index }}
     metadata:
       platform: AWS
       clusterType: self-managed