Skip to content

Commit 79d5b68

Browse files
author
Vishnu Challa
committed
Merging template changes in CI tests
Signed-off-by: Vishnu Challa <vchalla@vchalla-thinkpadp1gen2.rmtusnc.csb>
1 parent d312268 commit 79d5b68

11 files changed

+55
-71
lines changed

‎.github/workflows/ci-tests.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@ jobs:
1919
tests:
2020
needs: build
2121
uses: ./.github/workflows/tests.yaml
22-
secrets: inherit
23-

‎examples/label-small-scale-cluster-density.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests :
22
- name : small-scale-cluster-density-v2
3-
index: {{ ES_METADATA_INDEX }}
4-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
3+
index: {{ es_metadata_index }}
4+
benchmarkIndex: {{ es_benchmark_index }}
55
metadata:
66
platform: AWS
77
masterNodesType: m6a.xlarge

‎examples/payload-scale-415.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests :
22
- name : aws-small-scale-cluster-density-v2
3-
index: {{ ES_METADATA_INDEX }}
4-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
3+
index: {{ es_metadata_index }}
4+
benchmarkIndex: {{ es_benchmark_index }}
55
metadata:
66
platform: AWS
77
clusterType: self-managed
@@ -52,8 +52,8 @@ tests :
5252
value: duration
5353
agg_type: avg
5454
- name : aws-payload-scale-node-density
55-
index: {{ ES_METADATA_INDEX }}
56-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
55+
index: {{ es_metadata_index }}
56+
benchmarkIndex: {{ es_benchmark_index }}
5757
metadata:
5858
platform: AWS
5959
clusterType: self-managed

‎examples/payload-scale-416.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests :
22
- name : aws-small-scale-cluster-density-v2
3-
index: {{ ES_METADATA_INDEX }}
4-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
3+
index: {{ es_metadata_index }}
4+
benchmarkIndex: {{ es_benchmark_index }}
55
metadata:
66
platform: AWS
77
clusterType: self-managed
@@ -52,8 +52,8 @@ tests :
5252
value: duration
5353
agg_type: avg
5454
- name : aws-payload-scale-node-density
55-
index: {{ ES_METADATA_INDEX }}
56-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
55+
index: {{ es_metadata_index }}
56+
benchmarkIndex: {{ es_benchmark_index }}
5757
metadata:
5858
platform: AWS
5959
clusterType: self-managed

‎examples/readout-control-plane-cdv2.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests :
22
- name : cluster-density-v2-24nodes
3-
index: {{ ES_METADATA_INDEX }}
4-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
3+
index: {{ es_metadata_index }}
4+
benchmarkIndex: {{ es_benchmark_index }}
55
metadata:
66
ocpVersion: 4.15
77
platform: AWS
@@ -37,8 +37,8 @@ tests :
3737
agg_type: avg
3838

3939
- name : cluster-density-v2-120nodes
40-
index: {{ ES_METADATA_INDEX }}
41-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
40+
index: {{ es_metadata_index }}
41+
benchmarkIndex: {{ es_benchmark_index }}
4242
metadata:
4343
ocpVersion: 4.15
4444
platform: AWS
@@ -74,8 +74,8 @@ tests :
7474
agg_type: avg
7575

7676
- name : cluster-density-v2-249nodes
77-
index: {{ ES_METADATA_INDEX }}
78-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
77+
index: {{ es_metadata_index }}
78+
benchmarkIndex: {{ es_benchmark_index }}
7979
metadata:
8080
ocpVersion: 4.15
8181
platform: AWS
@@ -111,8 +111,8 @@ tests :
111111
agg_type: avg
112112

113113
- name : cdv2-kube-apiserver-etcd-249nodes
114-
index: {{ ES_METADATA_INDEX }}
115-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
114+
index: {{ es_metadata_index }}
115+
benchmarkIndex: {{ es_benchmark_index }}
116116
metadata:
117117
ocpVersion: 4.15
118118
platform: AWS
@@ -160,8 +160,8 @@ tests :
160160
agg_type: avg
161161

162162
- name : cd-v2-controller-manager-249nodes
163-
index: {{ ES_METADATA_INDEX }}
164-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
163+
index: {{ es_metadata_index }}
164+
benchmarkIndex: {{ es_benchmark_index }}
165165
metadata:
166166
ocpVersion: 4.15
167167
platform: AWS
@@ -204,8 +204,8 @@ tests :
204204
agg_type: avg
205205

206206
- name : cd-v2-api-request-latency-249nodes
207-
index: {{ ES_METADATA_INDEX }}
208-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
207+
index: {{ es_metadata_index }}
208+
benchmarkIndex: {{ es_benchmark_index }}
209209
metadata:
210210
ocpVersion: 4.15
211211
platform: AWS
@@ -249,8 +249,8 @@ tests :
249249
agg_type: avg
250250

251251
- name : cd-v2-etcd-latency-249nodes
252-
index: {{ ES_METADATA_INDEX }}
253-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
252+
index: {{ es_metadata_index }}
253+
benchmarkIndex: {{ es_benchmark_index }}
254254
metadata:
255255
ocpVersion: 4.15
256256
platform: AWS

‎examples/readout-control-plane-node-density.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests :
22
- name : node-density-heavy-24nodes
3-
index: {{ ES_METADATA_INDEX }}
4-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
3+
index: {{ es_metadata_index }}
4+
benchmarkIndex: {{ es_benchmark_index }}
55
metadata:
66
ocpVersion: 4.15
77
platform: AWS
@@ -49,8 +49,8 @@ tests :
4949
agg_type: avg
5050

5151
- name : node-density-24nodes
52-
index: {{ ES_METADATA_INDEX }}
53-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
52+
index: {{ es_metadata_index }}
53+
benchmarkIndex: {{ es_benchmark_index }}
5454
metadata:
5555
ocpVersion: 4.15
5656
platform: AWS
@@ -81,8 +81,8 @@ tests :
8181
agg_type: avg
8282

8383
- name : node-density-120nodes
84-
index: {{ ES_METADATA_INDEX }}
85-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
84+
index: {{ es_metadata_index }}
85+
benchmarkIndex: {{ es_benchmark_index }}
8686
metadata:
8787
ocpVersion: 4.15
8888
platform: AWS
@@ -113,8 +113,8 @@ tests :
113113
agg_type: avg
114114

115115
- name : node-density-249nodes
116-
index: {{ ES_METADATA_INDEX }}
117-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
116+
index: {{ es_metadata_index }}
117+
benchmarkIndex: {{ es_benchmark_index }}
118118
metadata:
119119
ocpVersion: 4.15
120120
platform: AWS
@@ -145,8 +145,8 @@ tests :
145145
agg_type: avg
146146

147147
- name : node-density-cni-24nodes
148-
index: {{ ES_METADATA_INDEX }}
149-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
148+
index: {{ es_metadata_index }}
149+
benchmarkIndex: {{ es_benchmark_index }}
150150
metadata:
151151
ocpVersion: 4.15
152152
platform: AWS
@@ -177,8 +177,8 @@ tests :
177177
agg_type: avg
178178

179179
- name : node-density-cni-120nodes
180-
index: {{ ES_METADATA_INDEX }}
181-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
180+
index: {{ es_metadata_index }}
181+
benchmarkIndex: {{ es_benchmark_index }}
182182
metadata:
183183
ocpVersion: 4.15
184184
platform: AWS
@@ -209,8 +209,8 @@ tests :
209209
agg_type: avg
210210

211211
- name : node-density-cni-249nodes
212-
index: {{ ES_METADATA_INDEX }}
213-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
212+
index: {{ es_metadata_index }}
213+
benchmarkIndex: {{ es_benchmark_index }}
214214
metadata:
215215
ocpVersion: 4.15
216216
platform: AWS

‎examples/small-scale-cluster-density.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests :
22
- name : aws-small-scale-cluster-density-v2
3-
index: {{ ES_METADATA_INDEX }}
4-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
3+
index: {{ es_metadata_index }}
4+
benchmarkIndex: {{ es_benchmark_index }}
55
metadata:
66
platform: AWS
77
masterNodesType: m6a.xlarge

‎examples/small-scale-node-density-cni.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests :
22
- name : aws-small-scale-node-density-cni
3-
index: {{ ES_METADATA_INDEX }}
4-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
3+
index: {{ es_metadata_index }}
4+
benchmarkIndex: {{ es_benchmark_index }}
55
metadata:
66
platform: AWS
77
masterNodesType: m6a.xlarge

‎examples/trt-external-payload-cluster-density.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests :
22
- name : payload-cluster-density-v2
3-
index: {{ ES_METADATA_INDEX }}
4-
benchmarkIndex: {{ ES_BENCHMARK_INDEX }}
3+
index: {{ es_metadata_index }}
4+
benchmarkIndex: {{ es_benchmark_index }}
55
metadata:
66
platform: AWS
77
clusterType: self-managed

‎examples/trt-payload-cluster-density.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests :
22
- name : payload-cluster-density-v2
3-
index: ospst-perf-scale-ci-*
4-
benchmarkIndex: ospst-ripsaw-kube-burner*
3+
index: {{ es_metadata_index }}
4+
benchmarkIndex: {{ es_benchmark_index }}
55
metadata:
66
platform: AWS
77
clusterType: self-managed

‎test.bats

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,37 +26,29 @@ run_cmd(){
2626
}
2727

2828
setup() {
29-
export UUID; UUID=$(uuidgen)
29+
export ES_SERVER="$ES_SERVER"
30+
export es_metadata_index="perf_scale_ci-*"
31+
export es_benchmark_index="ripsaw-kube-burner*"
3032
}
3133

3234
@test "orion cmd label small scale cluster density with hunter-analyze" {
33-
export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
34-
export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
3535
run_cmd orion cmd --config "examples/label-small-scale-cluster-density.yaml" --lookback 5d --hunter-analyze
3636
}
3737

3838
@test "orion cmd payload scale 4.15" {
39-
export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
40-
export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
4139
run_cmd orion cmd --config "examples/payload-scale-415.yaml" --lookback 5d
4240
}
4341

4442
@test "orion cmd payload scale 4.16 without lookback period" {
45-
export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
46-
export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
4743
run_cmd orion cmd --config "examples/payload-scale-416.yaml"
4844
}
4945

5046
@test "orion cmd readout control plane cdv2 with text output" {
51-
export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
52-
export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
5347
run_cmd orion cmd --config "examples/readout-control-plane-cdv2.yaml" --lookback 5d --hunter-analyze --output-format text --save-output-path=output.txt
5448
check_file_list output_cluster-density-v2-24nodes.txt
5549
}
5650

5751
@test "orion cmd readout control plane node-density with json output" {
58-
export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
59-
export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
6052
run_cmd orion cmd --config "examples/readout-control-plane-node-density.yaml" --lookback 5d --hunter-analyze --output-format json --save-output-path=output.json
6153
check_file_list output_node-density-heavy-24nodes.json
6254
}
@@ -66,20 +58,14 @@ setup() {
6658
check_file_list output_k8s-netperf-tcp.xml
6759
}
6860

69-
@test "orion cmd small scale cluster density with anamoly detection" {
70-
export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
71-
export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
72-
run_cmd orion cmd --config "examples/small-scale-cluster-density.yaml" --lookback 5d --anamoly-detection
61+
@test "orion cmd small scale cluster density with anomaly detection" {
62+
run_cmd orion cmd --config "examples/small-scale-cluster-density.yaml" --lookback 5d --anomaly-detection
7363
}
7464

75-
@test "orion cmd small scale node density cni with anamoly detection with a window" {
76-
export ES_METADATA_INDEX="ospst-perf-scale-ci-*"
77-
export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*"
78-
run_cmd orion cmd --config "examples/small-scale-node-density-cni.yaml" --anamoly-detection --anamoly-window 3
65+
@test "orion cmd small scale node density cni with anomaly detection with a window" {
66+
run_cmd orion cmd --config "examples/small-scale-node-density-cni.yaml" --anomaly-detection --anomaly-window 3
7967
}
8068

81-
@test "orion cmd trt external payload cluster density with anamoly detection with minimum percentage" {
82-
export ES_METADATA_INDEX="perf_scale_ci-*"
83-
export ES_BENCHMARK_INDEX="ripsaw-kube-burner*
84-
run_cmd orion cmd --config "examples/trt-external-payload-cluster-density.yaml" --anamoly-detection --anamoly-window 3 --min-anomaly-percent 5
69+
@test "orion cmd trt external payload cluster density with anomaly detection with minimum percentage" {
70+
run_cmd orion cmd --config "examples/trt-external-payload-cluster-density.yaml" --anomaly-detection --anomaly-window 3 --min-anomaly-percent 5
8571
}

0 commit comments

Comments
 (0)