Fix tests

Makefile

@@ -5,8 +5,5 @@ test-kafka-broker-upstream-nightly:
 test-kafka-broker-midstream-nightly:
 	./bin/test-kafka-broker-midstream-nightly.sh || exit 1
 
-test-kafka-broker-namespaced-upstream-nightly:
-	./bin/test-kafka-broker-namespaced-upstream-nightly.sh || exit 1
-
-test-kafka-broker-namespaced-midstream-nightly:
-	./bin/test-kafka-broker-namespaced-midstream-nightly.sh || exit 1
+generate:
+	./hack/generate.sh

bin/common.sh

@@ -14,7 +14,7 @@ export RECEIVER_DEPLOYMENT_REPLICAS=${RECEIVER_DEPLOYMENT_REPLICAS:-10}
 export SKIP_CREATE_TEST_RESOURCES=${SKIP_CREATE_TEST_RESOURCES:-false}
 export TEST_CASE_NAMESPACE=${TEST_CASE_NAMESPACE-"perf-test"}
 export WORKER_ONE=${WORKER_ONE:-node-role.kubernetes.io/worker=""}
-export NUM_WORKER_NODES=${NUM_WORKER_NODES:-"15"}
+export NUM_WORKER_NODES=${NUM_WORKER_NODES:-"10"}
 export ARTIFACT_DIR=${ARTIFACT_DIR:-"_output"}
 
 alias kubectl=oc

bin/run.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-
 # This script install the system using manifests in
 # `installation/manifests/product` by overriding
 # the variable KNATIVE_MANIFESTS (see `run.sh`

go.mod

@@ -0,0 +1,3 @@
+module github.com/openshift-knative/eventing-hyperfoil-benchmark
+
+go 1.21

hack/generate.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+repo_root_dir=$(dirname "$(realpath "${BASH_SOURCE[0]}")")/..
+
+GO111MODULE=off go get -u github.com/openshift-knative/hack/cmd/generate
+
+$(go env GOPATH)/bin/generate \
+  --root-dir "${repo_root_dir}" \
+  --generators dockerfile

installation/manifests/product-nightly/000-subscription-serverless.yaml

@@ -10,7 +10,7 @@ metadata:
   namespace: openshift-marketplace
 spec:
   displayName: Serverless Operator
-  image: registry.ci.openshift.org/knative/openshift-serverless-nightly:serverless-index
+  image: registry.ci.openshift.org/knative/main:serverless-index
   publisher: Red Hat
   sourceType: grpc
 ---

installation/manifests/product/100-knative-eventing.yaml

@@ -1,4 +1,4 @@
-apiVersion: operator.knative.dev/v1alpha1
+apiVersion: operator.knative.dev/v1beta1
 kind: KnativeEventing
 metadata:
   name: knative-eventing

installation/manifests/upstream-nightly/000-subscription-amq-streams.yaml

@@ -4,7 +4,7 @@ metadata:
   name: amq-streams
   namespace: openshift-operators
 spec:
-  channel: stable
+  channel: amq-streams-2.6.x
   name: amq-streams
   source: redhat-operators
   sourceNamespace: openshift-marketplace

installation/manifests/upstream-nightly/100-kafka.yaml

@@ -6,7 +6,7 @@ metadata:
   namespace: kafka
 spec:
   kafka:
-    version: 3.3.1
+    version: 3.6.0
     replicas: 3
     listeners:
       - name: plain
@@ -27,8 +27,8 @@ spec:
       offsets.topic.replication.factor: 3
       transaction.state.log.replication.factor: 3
       transaction.state.log.min.isr: 2
-      log.message.format.version: "3.3"
-      inter.broker.protocol.version: "3.3"
+      log.message.format.version: "3.6"
+      inter.broker.protocol.version: "3.6"
       auto.create.topics.enable: false
     storage:
       type: persistent-claim

openshift/ci-operator/build-image/Dockerfile

@@ -1,11 +1,27 @@
-# Dockerfile to bootstrap build and test in openshift-ci
+# DO NOT EDIT! Generated Dockerfile.
 
-FROM registry.ci.openshift.org/openshift/release:golang-1.18
+# Dockerfile to bootstrap build and test in openshift-ci
+FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16 as builder
 
-# Add kubernetes repository
-ADD openshift/ci-operator/build-image/kubernetes.repo /etc/yum.repos.d/
+RUN echo "[kubernetes]" >> /etc/yum.repos.d/kubernetes.repo && \
+    echo "name=Kubernetes" >> /etc/yum.repos.d/kubernetes.repo && \
+    echo "baseurl=https://pkgs.k8s.io/core:/stable:/v1.29/rpm/" >> /etc/yum.repos.d/kubernetes.repo && \
+    echo "enabled=1" >> /etc/yum.repos.d/kubernetes.repo && \
+    echo "gpgcheck=1" >> /etc/yum.repos.d/kubernetes.repo && \
+    echo "gpgkey=https://pkgs.k8s.io/core:/stable:/v1.29/rpm/repodata/repomd.xml.key" >> /etc/yum.repos.d/kubernetes.repo
 
 RUN yum install -y kubectl httpd-tools
 
+RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
+    chmod 700 ./get-helm-3
+
+RUN ./get-helm-3 --version v3.11.3 --no-sudo && helm version
+
+RUN GOFLAGS='' go install github.com/mikefarah/yq/v3@latest
+
+# go install creates $GOPATH/.cache with root permissions, we delete it here
+# to avoid permission issues with the runtime users
+RUN rm -rf $GOPATH/.cache
+
 # Allow runtime users to add entries to /etc/passwd
-RUN chmod g+rw /etc/passwd
+RUN chmod g+rw /etc/passwd

openshift/ci-operator/source-image/Dockerfile

@@ -0,0 +1,7 @@
+# DO NOT EDIT! Generated Dockerfile.
+
+FROM src
+
+RUN chmod +x vendor/k8s.io/code-generator/generate-groups.sh || true
+RUN chmod +x vendor/knative.dev/pkg/hack/generate-knative.sh || true
+RUN chmod +x vendor/k8s.io/code-generator/generate-internal-groups.sh || true

openshift/images.yaml

@@ -0,0 +1 @@
+{}

openshift/project.yaml

@@ -0,0 +1,2 @@
+project:
+  tag: knative-nightly