From bd49870bbf120da20f742229168f0d4ab3feb9e1 Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Mon, 6 Nov 2023 21:01:53 +0200 Subject: [PATCH] add perf target --- Makefile | 4 ++++ openshift/performance/patches/perf.patch | 22 +++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 9e3172f82c90..57d918069bff 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,10 @@ test-e2e: ./openshift/e2e-tests.sh .PHONY: test-e2e +perf-tests: + ./openshift/perf-tests.sh +.PHONY: perf-tests + test-e2e-tls: ENABLE_INTERNAL_TLS="true" ./openshift/e2e-tests.sh .PHONY: test-e2e-tls diff --git a/openshift/performance/patches/perf.patch b/openshift/performance/patches/perf.patch index 24700d6b2e72..09470e3b5bd4 100644 --- a/openshift/performance/patches/perf.patch +++ b/openshift/performance/patches/perf.patch @@ -1,7 +1,7 @@ -diff --git a/Makefile b/Makefile -index 9e3172f82..4da396560 100644 ---- a/Makefile -+++ b/Makefile +diff --git b/Makefile a/Makefile +index 57d918069..4da396560 100644 +--- b/Makefile ++++ a/Makefile @@ -6,6 +6,7 @@ CORE_IMAGES=./cmd/activator ./cmd/autoscaler ./cmd/autoscaler-hpa ./cmd/controll TEST_IMAGES=$(shell find ./test/test_images ./test/test_images/multicontainer -mindepth 1 -maxdepth 1 -type d) # Exclude wrapper images like multicontainer and initcontainers as those are just ko convenience wrappers used upstream. The openshift serverless tests use other images to run. @@ -10,10 +10,10 @@ index 9e3172f82..4da396560 100644 BRANCH= TEST= IMAGE= -@@ -26,10 +27,20 @@ test-install: +@@ -26,6 +27,12 @@ test-install: done .PHONY: test-install - + +perf-install: + for img in $(PERF_IMAGES); do \ + go install $$img ; \ @@ -23,15 +23,7 @@ index 9e3172f82..4da396560 100644 test-e2e: ./openshift/e2e-tests.sh .PHONY: test-e2e - -+perf-tests: -+ ./openshift/perf-tests.sh -+.PHONY: perf-tests -+ - test-e2e-tls: - ENABLE_INTERNAL_TLS="true" ./openshift/e2e-tests.sh - .PHONY: test-e2e-tls -@@ -60,8 +71,9 @@ test-e2e-local: +@@ -64,8 +71,9 @@ test-e2e-local: # Generate Dockerfiles for core and test images used by ci-operator. The files need to be committed manually. generate-dockerfiles: