CI fix to always capture latest ocp version (#89)

Signed-off-by: Vishnu Challa <[email protected]> Co-authored-by: Vishnu Challa <[email protected]>
cloud-bulldozer · Jan 21, 2025 · b82a6a8 · b82a6a8
1 parent 72374fa
commit b82a6a8
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 133 deletions.
diff --git a/examples/label-small-scale-cluster-density.yaml b/examples/label-small-scale-cluster-density.yaml
@@ -9,7 +9,7 @@ tests :
       workerNodesType: m6a.xlarge
       workerNodesCount: 24
       benchmark.keyword: cluster-density-v2
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       # networkType: OVNKubernetes
       # encrypted: true
       # fips: false

diff --git a/examples/payload-scale-416.yaml b/examples/payload-scale-416.yaml
diff --git a/examples/payload-scale-415.yaml → examples/payload-scale.yaml b/examples/payload-scale-415.yaml → examples/payload-scale.yaml
@@ -10,7 +10,7 @@ tests :
       workerNodesType: m6a.xlarge
       workerNodesCount: 6
       benchmark.keyword: cluster-density-v2
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       networkType: OVNKubernetes
 
     metrics : 
@@ -62,7 +62,7 @@ tests :
       workerNodesType: m6a.xlarge
       workerNodesCount: 6
       benchmark.keyword: node-density
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       networkType: OVNKubernetes
 
     metrics : 

diff --git a/examples/readout-control-plane-cdv2.yaml b/examples/readout-control-plane-cdv2.yaml
@@ -3,7 +3,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: cluster-density-v2
@@ -40,7 +40,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: cluster-density-v2
@@ -77,7 +77,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: cluster-density-v2
@@ -114,7 +114,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: cluster-density-v2
@@ -163,7 +163,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: cluster-density-v2
@@ -207,7 +207,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: cluster-density-v2
@@ -252,7 +252,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: cluster-density-v2

diff --git a/examples/readout-control-plane-node-density.yaml b/examples/readout-control-plane-node-density.yaml
@@ -3,7 +3,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: node-density-heavy
@@ -52,7 +52,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: node-density
@@ -84,7 +84,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: node-density
@@ -116,7 +116,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: node-density
@@ -148,7 +148,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: node-density-cni
@@ -180,7 +180,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: node-density-cni
@@ -212,7 +212,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: node-density-cni

diff --git a/examples/readout-netperf-tcp.yaml b/examples/readout-netperf-tcp.yaml
@@ -3,7 +3,7 @@ tests :
     index: {{ es_metadata_index }}
     benchmarkIndex: {{ es_benchmark_index }}
     metadata:
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       platform: AWS
       clusterType: rosa
       benchmark.keyword: k8s-netperf

diff --git a/examples/small-scale-cluster-density.yaml b/examples/small-scale-cluster-density.yaml
@@ -9,7 +9,7 @@ tests :
       workerNodesType: m6a.xlarge
       workerNodesCount: 24
       benchmark.keyword: cluster-density-v2
-      ocpVersion: 4.15
+      ocpVersion: {{ version }}
       networkType: OVNKubernetes
     # encrypted: true
     # fips: false

diff --git a/examples/small-scale-node-density-cni.yaml b/examples/small-scale-node-density-cni.yaml
@@ -10,7 +10,7 @@ tests :
       workerNodesCount: 6
       infraNodesCount: 3
       benchmark.keyword: node-density-cni
-      ocpVersion: 4.14
+      ocpVersion: {{ version }}
       networkType: OVNKubernetes
       infraNodesType: r5.2xlarge
     # encrypted: true

diff --git a/examples/trt-payload-cluster-density.yaml b/examples/trt-payload-cluster-density.yaml
@@ -10,7 +10,7 @@ tests :
       workerNodesType: m6a.xlarge
       workerNodesCount: 6
       benchmark.keyword: cluster-density-v2
-      ocpVersion: 4.17
+      ocpVersion: {{ version }}
       networkType: OVNKubernetes
 
     metrics : 

diff --git a/test.bats b/test.bats
@@ -26,19 +26,52 @@ setup() {
   export ES_SERVER="$QE_ES_SERVER"
   export es_metadata_index="perf_scale_ci*"
   export es_benchmark_index="ripsaw-kube-burner*"
-  export version='4.17'
+  LATEST_VERSION=$(curl -s -X POST "$ES_SERVER/perf_scale_ci*/_search" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "size": 0,
+    "query": {
+      "bool": {
+        "must": [
+          {
+            "range": {
+              "timestamp": {
+                "gte": "now-1M/M",
+                "lt": "now/M"
+              }
+            }
+          }
+        ],
+        "must_not": [
+          { "wildcard": { "releaseStream.keyword": "*nightly*" } },
+          { "wildcard": { "releaseStream.keyword": "*rc*" } },
+          { "wildcard": { "releaseStream.keyword": "*ci*" } },
+          { "wildcard": { "releaseStream.keyword": "*ec*" } }
+        ]
+      }
+    },
+    "aggs": {
+      "distinct_versions": {
+        "terms": {
+          "field": "releaseStream.keyword",
+          "order": { "_key": "desc" }
+        }
+      }
+    }
+  }' | jq -r '.aggregations.distinct_versions.buckets[0].key')
+  export version=$(echo "$LATEST_VERSION" | cut -d. -f1,2)
 }
 
 @test "orion cmd label small scale cluster density with hunter-analyze " {
   run_cmd orion cmd --config "examples/label-small-scale-cluster-density.yaml" --lookback 5d --hunter-analyze
 }
 
-@test "orion cmd payload scale 4.15 " {
-  run_cmd orion cmd --config "examples/payload-scale-415.yaml" --lookback 5d --hunter-analyze
+@test "orion cmd payload scale " {
+  run_cmd orion cmd --config "examples/payload-scale.yaml" --lookback 5d --hunter-analyze
 }
 
-@test "orion cmd payload scale 4.16 without lookback period " {
-  run_cmd orion cmd --config "examples/payload-scale-416.yaml" --hunter-analyze
+@test "orion cmd payload scale without lookback period " {
+  run_cmd orion cmd --config "examples/payload-scale.yaml" --hunter-analyze
 }
 
 @test "orion cmd readout control plane cdv2 with text output " {
@@ -109,7 +142,7 @@ setup() {
   orion daemon --port 8080 &
   DAEMON_PID=$!
   echo "Orion daemon started with PID $DAEMON_PID"
-  run_cmd curl http://127.0.0.1:8080/daemon/changepoint?version=4.17&filter_changepoints=false&test_name=trt-payload-cluster-density
+  run_cmd curl http://127.0.0.1:8080/daemon/changepoint?version=$version&filter_changepoints=false&test_name=trt-payload-cluster-density
   if [ ! -z "$DAEMON_PID" ]; then
     kill $DAEMON_PID
     echo "Orion daemon with PID $DAEMON_PID killed"