fix image env vars

skonto · Nov 8, 2023 · efa3fa4 · efa3fa4
1 parent cfaa224
commit efa3fa4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/openshift/performance/README.md b/openshift/performance/README.md
@@ -5,12 +5,12 @@
 
 # images are meant to be built on CI, however any user built image can be passed as follows:
 
-export KNATIVE_SERVING_PERF_TEST_DATAPLANE_PROBE_DEPLOYMENT=docker.io/skonto/dataplane-probe-13daa01eab9bbd0b55b029ef0217990f@sha256:38888e57c2eaba6de9689bde4313904af022161ac659617334e5605b15af4286
-export KNATIVE_SERVING_PERF_TEST_REAL_TRAFFIC=docker.io/skonto/real-traffic-test-0d6cfd702f7100116b002498a1c9d449@sha256:7109b39aa4325b0c86a1b4251a672abc0e3dc362d14e32ad1886f762942ab410
-export KNATIVE_SERVING_PERF_TEST_ROLLOUT_PROBE=docker.io/skonto/rollout-probe-16b878ae522fca2c6d0a486b4be446cd@sha256:224d53bbcf2021c41d25271ae32c41207e2f6fb44a9eb465d074126e3493fb2e
-export KNATIVE_SERVING_PERF_TEST_LOAD_TEST=docker.io/skonto/load-test-16ad8813e1e519c16903611ab3798c1c@sha256:d98d359e8bd1e39615ae6f5226ed0ec90c40d8eb8dec8915da6e87054ea2d32d
-export KNATIVE_SERVING_PERF_TEST_RECONCILIATION_DELAY=docker.io/skonto/reconciliation-delay-6074d88fac79c5d2be9fb1c4ae840488@sha256:6db2558e597a44fa4e735cd8a88c0183cffa18c04b4941ef9dd43687cf0cb5a8
-export KNATIVE_SERVING_PERF_TEST_SCALE_FROM_ZERO=docker.io/skonto/scale-from-zero-9924dc8c7b18ccca4da8563a28b55a50@sha256:5b8807543da8ef4e43020e61e1cf7e37dfd90747882aeedd3999fbab76da4d04
+export KNATIVE_SERVING_DATAPLANE_PROBE=docker.io/skonto/dataplane-probe-13daa01eab9bbd0b55b029ef0217990f@sha256:38888e57c2eaba6de9689bde4313904af022161ac659617334e5605b15af4286
+export KNATIVE_SERVING_REAL_TRAFFIC_TEST=docker.io/skonto/real-traffic-test-0d6cfd702f7100116b002498a1c9d449@sha256:7109b39aa4325b0c86a1b4251a672abc0e3dc362d14e32ad1886f762942ab410
+export KNATIVE_SERVING_ROLLOUT_PROBE=docker.io/skonto/rollout-probe-16b878ae522fca2c6d0a486b4be446cd@sha256:224d53bbcf2021c41d25271ae32c41207e2f6fb44a9eb465d074126e3493fb2e
+export KNATIVE_SERVING_LOAD_TEST=docker.io/skonto/load-test-16ad8813e1e519c16903611ab3798c1c@sha256:d98d359e8bd1e39615ae6f5226ed0ec90c40d8eb8dec8915da6e87054ea2d32d
+export KNATIVE_SERVING_RECONCILIATION_DELAY=docker.io/skonto/reconciliation-delay-6074d88fac79c5d2be9fb1c4ae840488@sha256:6db2558e597a44fa4e735cd8a88c0183cffa18c04b4941ef9dd43687cf0cb5a8
+export KNATIVE_SERVING_SCALE_FROM_ZERO=docker.io/skonto/scale-from-zero-9924dc8c7b18ccca4da8563a28b55a50@sha256:5b8807543da8ef4e43020e61e1cf7e37dfd90747882aeedd3999fbab76da4d04
 export KNATIVE_SERVING_TEST_AUTOSCALE=docker.io/skonto/autoscale-c163c422b72a456bad9aedab6b2d1f13@sha256:02fc725cef343d41d2278322eef4dd697a6a865290f5afd02ff1a39213f4bbcb
 
 export KNATIVE_SERVING_TEST_RUNTIME=docker.io/skonto/runtime-5fa7cf4c043dfad63fa28de0cfa3b264@sha256:ff5aece839ddec959ed4f2e32c61731ac8ea2550f29a63d73bce100a8a4b004e

diff --git a/openshift/performance/scripts/run-all-performance-tests.sh b/openshift/performance/scripts/run-all-performance-tests.sh
@@ -69,8 +69,8 @@ fi
 ###############################################################################################
 header "Real traffic test"
 toggle_feature kubernetes.podspec-init-containers Enabled
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_REAL_TRAFFIC}," "${SERVING}/test/performance/benchmarks/real-traffic-test/real-traffic-test.yaml"
-run_job real-traffic-test "${SERVING}/test/performance/benchmarks/real-traffic-test/real-traffic-test.yaml" "${KNATIVE_SERVING_PERF_TEST_REAL_TRAFFIC%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_REAL_TRAFFIC_TEST}," "${SERVING}/test/performance/benchmarks/real-traffic-test/real-traffic-test.yaml"
+run_job real-traffic-test "${SERVING}/test/performance/benchmarks/real-traffic-test/real-traffic-test.yaml" "${KNATIVE_SERVING_REAL_TRAFFIC_TEST%/*}"
 sleep 100 # wait a bit for the cleanup to be done
 kubectl delete ksvc -n "$ns" --all --wait --now
 toggle_feature kubernetes.podspec-init-containers Disabled
@@ -88,8 +88,8 @@ oc wait --timeout=60s --for=condition=available deploy -n "$ns" deployment
 ##############################################################################################
 header "Dataplane probe: deployment"
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_DATAPLANE_PROBE_DEPLOYMENT}," "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-deployment.yaml"
-run_job dataplane-probe-deployment "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-deployment.yaml" "${KNATIVE_SERVING_PERF_TEST_DATAPLANE_PROBE_DEPLOYMENT%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_DATAPLANE_PROBE}," "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-deployment.yaml"
+run_job dataplane-probe-deployment "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-deployment.yaml" "${KNATIVE_SERVING_DATAPLANE_PROBE%/*}"
 
 # additional clean up
 oc delete deploy deployment -n "$ns" --ignore-not-found=true
@@ -100,8 +100,8 @@ oc wait --for=delete svc/deployment --timeout=60s -n "$ns"
 ##############################################################################################
 header "Dataplane probe: activator"
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_DATAPLANE_PROBE_DEPLOYMENT}," "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-activator.yaml"
-run_job dataplane-probe-activator "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-activator.yaml" "${KNATIVE_SERVING_PERF_TEST_DATAPLANE_PROBE_DEPLOYMENT%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_DATAPLANE_PROBE}," "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-activator.yaml"
+run_job dataplane-probe-activator "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-activator.yaml" "${KNATIVE_SERVING_DATAPLANE_PROBE%/*}"
 
 # additional clean up
 oc delete ksvc activator -n "$ns" --ignore-not-found=true
@@ -110,8 +110,8 @@ oc wait --for=delete ksvc/activator --timeout=60s -n "$ns"
 ###############################################################################################
 header "Dataplane probe: queue proxy"
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_DATAPLANE_PROBE_DEPLOYMENT}," "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-queue.yaml"
-run_job dataplane-probe-queue "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-queue.yaml" "${KNATIVE_SERVING_PERF_TEST_DATAPLANE_PROBE_DEPLOYMENT%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_DATAPLANE_PROBE}," "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-queue.yaml"
+run_job dataplane-probe-queue "${SERVING}/test/performance/benchmarks/dataplane-probe/dataplane-probe-queue.yaml" "${KNATIVE_SERVING_DATAPLANE_PROBE%/*}"
 
 # additional clean up
 oc delete ksvc queue-proxy -n "$ns" --ignore-not-found=true
@@ -120,28 +120,28 @@ oc wait --for=delete ksvc/queue-proxy --timeout=60s -n "$ns"
 ###############################################################################################
 header "Reconciliation delay test"
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_RECONCILIATION_DELAY}," "${SERVING}/test/performance/benchmarks/reconciliation-delay/reconciliation-delay.yaml"
-run_job reconciliation-delay "${SERVING}/test/performance/benchmarks/reconciliation-delay/reconciliation-delay.yaml" "${KNATIVE_SERVING_PERF_TEST_RECONCILIATION_DELAY%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_RECONCILIATION_DELAY}," "${SERVING}/test/performance/benchmarks/reconciliation-delay/reconciliation-delay.yaml"
+run_job reconciliation-delay "${SERVING}/test/performance/benchmarks/reconciliation-delay/reconciliation-delay.yaml" "${KNATIVE_SERVING_RECONCILIATION_DELAY%/*}"
 ###############################################################################################
 header "Scale from Zero test"
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_SCALE_FROM_ZERO}," "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-1.yaml"
-run_job scale-from-zero-1 "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-1.yaml"  "${KNATIVE_SERVING_PERF_TEST_SCALE_FROM_ZERO%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_SCALE_FROM_ZERO}," "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-1.yaml"
+run_job scale-from-zero-1 "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-1.yaml"  "${KNATIVE_SERVING_SCALE_FROM_ZERO%/*}"
 oc delete ksvc -n "$ns" --all --wait --now
 sleep 5 # wait a bit for the cleanup to be done
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_SCALE_FROM_ZERO}," "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-5.yaml"
-run_job scale-from-zero-5 "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-5.yaml" "${KNATIVE_SERVING_PERF_TEST_SCALE_FROM_ZERO%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_SCALE_FROM_ZERO}," "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-5.yaml"
+run_job scale-from-zero-5 "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-5.yaml" "${KNATIVE_SERVING_SCALE_FROM_ZERO%/*}"
 oc delete ksvc -n "$ns" --all --wait --now
 sleep 25 # wait a bit for the cleanup to be done
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_SCALE_FROM_ZERO}," "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-25.yaml"
-run_job scale-from-zero-25 "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-25.yaml" "${KNATIVE_SERVING_PERF_TEST_SCALE_FROM_ZERO%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_SCALE_FROM_ZERO}," "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-25.yaml"
+run_job scale-from-zero-25 "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-25.yaml" "${KNATIVE_SERVING_SCALE_FROM_ZERO%/*}"
 oc delete ksvc -n "$ns" --all --wait --now
 sleep 50 # wait a bit for the cleanup to be done
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_SCALE_FROM_ZERO}," "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-100.yaml"
-run_job scale-from-zero-100 "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-100.yaml" "${KNATIVE_SERVING_PERF_TEST_SCALE_FROM_ZERO%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_SCALE_FROM_ZERO}," "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-100.yaml"
+run_job scale-from-zero-100 "${SERVING}/test/performance/benchmarks/scale-from-zero/scale-from-zero-100.yaml" "${KNATIVE_SERVING_SCALE_FROM_ZERO%/*}"
 oc delete ksvc -n "$ns" --all --wait --now
 sleep 100 # wait a bit for the cleanup to be done
 
@@ -157,8 +157,8 @@ oc wait --timeout=60s --for=condition=ready ksvc -n "$ns" --all
 ################################################################################################
 header "Load test: zero"
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_LOAD_TEST}," "${SERVING}/test/performance/benchmarks/load-test/load-test-0-direct.yaml"
-run_job load-test-zero "${SERVING}/test/performance/benchmarks/load-test/load-test-0-direct.yaml" "${KNATIVE_SERVING_PERF_TEST_LOAD_TEST%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_LOAD_TEST}," "${SERVING}/test/performance/benchmarks/load-test/load-test-0-direct.yaml"
+run_job load-test-zero "${SERVING}/test/performance/benchmarks/load-test/load-test-0-direct.yaml" "${KNATIVE_SERVING_LOAD_TEST%/*}"
 
 # additional clean up
 oc delete ksvc load-test-zero -n "$ns"  --ignore-not-found=true
@@ -167,8 +167,8 @@ oc wait --for=delete ksvc/load-test-zero --timeout=60s -n "$ns"
 ##################################################################################################
 header "Load test: always direct"
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_LOAD_TEST}," "${SERVING}/test/performance/benchmarks/load-test/load-test-always-direct.yaml"
-run_job load-test-always "${SERVING}/test/performance/benchmarks/load-test/load-test-always-direct.yaml" "${KNATIVE_SERVING_PERF_TEST_LOAD_TEST%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_LOAD_TEST}," "${SERVING}/test/performance/benchmarks/load-test/load-test-always-direct.yaml"
+run_job load-test-always "${SERVING}/test/performance/benchmarks/load-test/load-test-always-direct.yaml" "${KNATIVE_SERVING_LOAD_TEST%/*}"
 
 # additional clean up
 oc delete ksvc load-test-always -n "$ns"  --ignore-not-found=true
@@ -177,8 +177,8 @@ oc wait --for=delete ksvc/load-test-always --timeout=60s -n "$ns"
 #################################################################################################
 header "Load test: 200 direct"
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_LOAD_TEST}," "${SERVING}/test/performance/benchmarks/load-test/load-test-200-direct.yaml"
-run_job load-test-200 "${SERVING}/test/performance/benchmarks/load-test/load-test-200-direct.yaml" "${KNATIVE_SERVING_PERF_TEST_LOAD_TEST%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_LOAD_TEST}," "${SERVING}/test/performance/benchmarks/load-test/load-test-200-direct.yaml"
+run_job load-test-200 "${SERVING}/test/performance/benchmarks/load-test/load-test-200-direct.yaml" "${KNATIVE_SERVING_LOAD_TEST%/*}"
 
 # additional clean up
 oc delete ksvc load-test-200 -n "$ns"  --ignore-not-found=true
@@ -194,8 +194,8 @@ oc apply -f "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-
 popd
 oc wait --timeout=800s --for=condition=ready ksvc -n "$ns" --all
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_ROLLOUT_PROBE}," "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-activator-direct.yaml"
-run_job rollout-probe-activator-direct "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-activator-direct.yaml" "${KNATIVE_SERVING_PERF_TEST_ROLLOUT_PROBE%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_ROLLOUT_PROBE}," "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-activator-direct.yaml"
+run_job rollout-probe-activator-direct "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-activator-direct.yaml" "${KNATIVE_SERVING_ROLLOUT_PROBE%/*}"
 
 # additional clean up
 oc delete ksvc activator-with-cc -n "$ns" --ignore-not-found=true
@@ -210,8 +210,8 @@ oc apply -f "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-
 popd
 oc wait --timeout=800s --for=condition=ready ksvc -n "$ns" --all
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_ROLLOUT_PROBE}," "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-activator-direct-lin.yaml"
-run_job rollout-probe-activator-direct-lin "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-activator-direct-lin.yaml" "${KNATIVE_SERVING_PERF_TEST_ROLLOUT_PROBE%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_ROLLOUT_PROBE}," "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-activator-direct-lin.yaml"
+run_job rollout-probe-activator-direct-lin "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-activator-direct-lin.yaml" "${KNATIVE_SERVING_ROLLOUT_PROBE%/*}"
 
 # additional clean up
 oc delete ksvc activator-with-cc-lin -n "$ns" --ignore-not-found=true
@@ -226,8 +226,8 @@ oc apply -f "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-
 popd
 oc wait --timeout=800s --for=condition=ready ksvc -n "$ns" --all
 
-sed -i "s,image: .*,image: ${KNATIVE_SERVING_PERF_TEST_ROLLOUT_PROBE}," "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-queue-proxy-direct.yaml"
-run_job rollout-probe-queue-direct "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-queue-proxy-direct.yaml" "${KNATIVE_SERVING_PERF_TEST_ROLLOUT_PROBE%/*}"
+sed -i "s,image: .*,image: ${KNATIVE_SERVING_ROLLOUT_PROBE}," "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-queue-proxy-direct.yaml"
+run_job rollout-probe-queue-direct "${SERVING}/test/performance/benchmarks/rollout-probe/rollout-probe-queue-proxy-direct.yaml" "${KNATIVE_SERVING_ROLLOUT_PROBE%/*}"
 
 # additional clean up
 oc delete ksvc queue-proxy-with-cc -n "$ns" --ignore-not-found=true