Merging template changes in CI tests

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

Hide file tree

Showing 11 changed files with 62 additions and 70 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -34,4 +34,6 @@ jobs:
         bats -F pretty -T --print-output-on-failure test.bats
       env:
         TERM: linux      
-        ES_SERVER: ${{ secrets.ES_SERVER }}
+        QE_ES_HOST: ${{ secrets.QE_ES_HOST }}
+        QE_ES_USERNAME: ${{ secrets.QE_ES_USERNAME }}
+        QE_ES_PASSWORD: ${{ secrets.QE_ES_PASSWORD }}
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

diff --git a/test.bats b/test.bats
@@ -26,37 +26,33 @@ run_cmd(){
 }
 
 setup() {
-  export UUID; UUID=$(uuidgen)
+  echo $QE_ES_HOST
+  echo $QE_ES_USERNAME
+  echo $QE_ES_PASSWORD
+  echo $TERM
+  export ES_SERVER="https://$QE_ES_USERNAME:$QE_ES_PASSWORD@$QE_ES_HOST"
+  export es_metadata_index="perf_scale_ci"
+  export es_benchmark_index="ripsaw-kube-burner"
 }
 
 @test "orion cmd label small scale cluster density with hunter-analyze" {
-  export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
-  export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
   run_cmd orion cmd --config "examples/label-small-scale-cluster-density.yaml" --lookback 5d --hunter-analyze
 }
 
 @test "orion cmd payload scale 4.15" {
-  export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
-  export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
   run_cmd orion cmd --config "examples/payload-scale-415.yaml" --lookback 5d
 }
 
 @test "orion cmd payload scale 4.16 without lookback period" {
-  export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
-  export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
   run_cmd orion cmd --config "examples/payload-scale-416.yaml"
 }
 
 @test "orion cmd readout control plane cdv2 with text output" {
-  export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
-  export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
   run_cmd orion cmd --config "examples/readout-control-plane-cdv2.yaml" --lookback 5d --hunter-analyze --output-format text --save-output-path=output.txt
   check_file_list output_cluster-density-v2-24nodes.txt
 }
 
 @test "orion cmd readout control plane node-density with json output" {
-  export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
-  export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
   run_cmd orion cmd --config "examples/readout-control-plane-node-density.yaml" --lookback 5d --hunter-analyze --output-format json --save-output-path=output.json
   check_file_list output_node-density-heavy-24nodes.json
 }
@@ -66,20 +62,14 @@ setup() {
   check_file_list output_k8s-netperf-tcp.xml
 }
 
-@test "orion cmd small scale cluster density with anamoly detection" {
-  export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
-  export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
-  run_cmd orion cmd --config "examples/small-scale-cluster-density.yaml" --lookback 5d --anamoly-detection 
+@test "orion cmd small scale cluster density with anomaly detection" {
+  run_cmd orion cmd --config "examples/small-scale-cluster-density.yaml" --lookback 5d --anomaly-detection 
 }
 
-@test "orion cmd small scale node density cni with anamoly detection with a window" {
-  export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
-  export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
-  run_cmd orion cmd --config "examples/small-scale-node-density-cni.yaml" --anamoly-detection --anamoly-window 3
+@test "orion cmd small scale node density cni with anomaly detection with a window" {
+  run_cmd orion cmd --config "examples/small-scale-node-density-cni.yaml" --anomaly-detection --anomaly-window 3
 }
 
-@test "orion cmd trt external payload cluster density with anamoly detection with minimum percentage" {
-  export ES_METADATA_INDEX="perf_scale_ci-*"
-  export ES_BENCHMARK_INDEX="ripsaw-kube-burner*
-  run_cmd orion cmd --config "examples/trt-external-payload-cluster-density.yaml" --anamoly-detection --anamoly-window 3 --min-anomaly-percent 5
+@test "orion cmd trt external payload cluster density with anomaly detection with minimum percentage" {
+  run_cmd orion cmd --config "examples/trt-external-payload-cluster-density.yaml" --anomaly-detection --anomaly-window 3 --min-anomaly-percent 5
 }