diff --git a/tests/perfscale-sizing-recommendation/00-before_test.sh b/tests/perfscale-sizing-recommendation/00-before_test.sh index 97b0e6f..f051e2f 100755 --- a/tests/perfscale-sizing-recommendation/00-before_test.sh +++ b/tests/perfscale-sizing-recommendation/00-before_test.sh @@ -9,8 +9,6 @@ # set -o errexit # set -o pipefail -sizing="${1:-'small'}" - sleep_time=30 r=10 # Number of repeats @@ -100,25 +98,7 @@ done ### PREPARE TEMPOSTACK ### log_task "TempoStack" -case $sizing in - small) - oc create -f ./content/03-tempostack_small.yaml - ;; - - medium) - oc create -f ./content/03-tempostack_medium.yaml - ;; - - heavy) - oc create -f ./content/03-tempostack_heavy.yaml - ;; - - *) - echo "!! Unknown parameter. Please use small/medium/heavy !!" - echo "!! Run 'bash 02-after_test_cleaning.sh' to clean leftovers" - exit 1 - ;; -esac +oc create -f ./content/03-tempostack.yaml sleep 5 for i in $(seq $r) diff --git a/tests/perfscale-sizing-recommendation/content/03-tempostack_small.yaml b/tests/perfscale-sizing-recommendation/content/03-tempostack.yaml similarity index 87% rename from tests/perfscale-sizing-recommendation/content/03-tempostack_small.yaml rename to tests/perfscale-sizing-recommendation/content/03-tempostack.yaml index 751f36c..751209e 100644 --- a/tests/perfscale-sizing-recommendation/content/03-tempostack_small.yaml +++ b/tests/perfscale-sizing-recommendation/content/03-tempostack.yaml @@ -10,11 +10,6 @@ spec: metrics: createPrometheusRules: true createServiceMonitors: true - resources: - total: - limits: - cpu: 2000m - memory: 4Gi template: queryFrontend: component: diff --git a/tests/perfscale-sizing-recommendation/content/03-tempostack_heavy.yaml b/tests/perfscale-sizing-recommendation/content/03-tempostack_heavy.yaml deleted file mode 100644 index 37143ff..0000000 --- a/tests/perfscale-sizing-recommendation/content/03-tempostack_heavy.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: tempo.grafana.com/v1alpha1 -kind: TempoStack -metadata: - name: tempostack - namespace: test-perfscale -spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - observability: - metrics: - createPrometheusRules: true - createServiceMonitors: true - resources: - total: - limits: - cpu: 32000m - memory: 32Gi - template: - queryFrontend: - component: - resources: - limits: - cpu: "2" - memory: 2Gi - jaegerQuery: - enabled: true - storage: - secret: - type: s3 - name: s3-secret - storageSize: 10Gi - diff --git a/tests/perfscale-sizing-recommendation/content/03-tempostack_medium.yaml b/tests/perfscale-sizing-recommendation/content/03-tempostack_medium.yaml deleted file mode 100644 index 10b145b..0000000 --- a/tests/perfscale-sizing-recommendation/content/03-tempostack_medium.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: tempo.grafana.com/v1alpha1 -kind: TempoStack -metadata: - name: tempostack - namespace: test-perfscale -spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - observability: - metrics: - createPrometheusRules: true - createServiceMonitors: true - resources: - total: - limits: - cpu: 16000m - memory: 16Gi - template: - queryFrontend: - component: - resources: - limits: - cpu: "2" - memory: 2Gi - jaegerQuery: - enabled: true - storage: - secret: - type: s3 - name: s3-secret - storageSize: 10Gi -