Skip to content

Commit 978d7e0

Browse files
committed
use the test-private repo for test
Signed-off-by: Jian Zhang <[email protected]>
1 parent 580c3c8 commit 978d7e0

File tree

4 files changed

+131
-18
lines changed

4 files changed

+131
-18
lines changed

ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__amd64-nightly.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,16 @@ tests:
264264
test:
265265
- ref: openshift-extended-test-longduration
266266
workflow: cucushift-installer-rehearse-aws-ipi
267+
- as: olmv1-benchmark-test
268+
cluster: build05
269+
cron: 0 0,4 * * *
270+
steps:
271+
allow_skip_on_success: true
272+
cluster_profile: gcp-qe
273+
test:
274+
- ref: olmv1-performance
275+
workflow: cucushift-installer-rehearse-gcp-ipi
276+
timeout: 3h0m0s
267277
- as: aws-ipi-f14-stress-olm
268278
cron: 34 22 1,15 * *
269279
steps:

ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19-periodics.yaml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39412,6 +39412,90 @@ periodics:
3941239412
- name: result-aggregator
3941339413
secret:
3941439414
secretName: result-aggregator
39415+
- agent: kubernetes
39416+
cluster: build05
39417+
cron: 0 0,4 * * *
39418+
decorate: true
39419+
decoration_config:
39420+
skip_cloning: true
39421+
timeout: 3h0m0s
39422+
extra_refs:
39423+
- base_ref: release-4.19
39424+
org: openshift
39425+
repo: openshift-tests-private
39426+
labels:
39427+
ci-operator.openshift.io/cloud: gcp
39428+
ci-operator.openshift.io/cloud-cluster-profile: gcp-qe
39429+
ci-operator.openshift.io/cluster: build05
39430+
ci-operator.openshift.io/variant: amd64-nightly
39431+
ci.openshift.io/generator: prowgen
39432+
job-release: "4.19"
39433+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
39434+
name: periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-olmv1-benchmark-test
39435+
spec:
39436+
containers:
39437+
- args:
39438+
- --gcs-upload-secret=/secrets/gcs/service-account.json
39439+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
39440+
- --lease-server-credentials-file=/etc/boskos/credentials
39441+
- --oauth-token-path=/usr/local/github-credentials/oauth
39442+
- --report-credentials-file=/etc/report/credentials
39443+
- --secret-dir=/secrets/ci-pull-credentials
39444+
- --target=olmv1-benchmark-test
39445+
- --variant=amd64-nightly
39446+
command:
39447+
- ci-operator
39448+
image: ci-operator:latest
39449+
imagePullPolicy: Always
39450+
name: ""
39451+
resources:
39452+
requests:
39453+
cpu: 10m
39454+
volumeMounts:
39455+
- mountPath: /etc/boskos
39456+
name: boskos
39457+
readOnly: true
39458+
- mountPath: /secrets/ci-pull-credentials
39459+
name: ci-pull-credentials
39460+
readOnly: true
39461+
- mountPath: /secrets/gcs
39462+
name: gcs-credentials
39463+
readOnly: true
39464+
- mountPath: /usr/local/github-credentials
39465+
name: github-credentials-openshift-ci-robot-private-git-cloner
39466+
readOnly: true
39467+
- mountPath: /secrets/manifest-tool
39468+
name: manifest-tool-local-pusher
39469+
readOnly: true
39470+
- mountPath: /etc/pull-secret
39471+
name: pull-secret
39472+
readOnly: true
39473+
- mountPath: /etc/report
39474+
name: result-aggregator
39475+
readOnly: true
39476+
serviceAccountName: ci-operator
39477+
volumes:
39478+
- name: boskos
39479+
secret:
39480+
items:
39481+
- key: credentials
39482+
path: credentials
39483+
secretName: boskos-credentials
39484+
- name: ci-pull-credentials
39485+
secret:
39486+
secretName: ci-pull-credentials
39487+
- name: github-credentials-openshift-ci-robot-private-git-cloner
39488+
secret:
39489+
secretName: github-credentials-openshift-ci-robot-private-git-cloner
39490+
- name: manifest-tool-local-pusher
39491+
secret:
39492+
secretName: manifest-tool-local-pusher
39493+
- name: pull-secret
39494+
secret:
39495+
secretName: registry-pull-credentials
39496+
- name: result-aggregator
39497+
secret:
39498+
secretName: result-aggregator
3941539499
- agent: kubernetes
3941639500
cluster: vsphere02
3941739501
cron: 32 17 5,19 * *

ci-operator/step-registry/olmv1/performance/olmv1-performance-commands.sh

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,29 @@ if [ -e "${ES_SECRETS_PATH}/host" ]; then
2323
ES_HOST=$(cat "${ES_SECRETS_PATH}/host")
2424
fi
2525

26-
# # download kube-burner-ocp
27-
# KUBE_BURNER_VERSION=1.6.8
28-
29-
git clone https://github.com/kube-burner/kube-burner-ocp.git --branch main --depth 1
30-
pushd kube-burner-ocp
31-
make build
32-
./bin/amd64/kube-burner-ocp olm -h
26+
LOG_LEVEL=${LOG_LEVEL:-debug}
27+
KUBE_DIR=${KUBE_DIR:-/tmp}
28+
KUBE_BURNER_VERSION=${KUBE_BURNER_VERSION:-1.6.8}
29+
PERFORMANCE_PROFILE=${PERFORMANCE_PROFILE:-default}
30+
CHURN=${CHURN:-true}
31+
PPROF=${PPROF:-true}
32+
ARCHIVE=${ARCHIVE:-true}
33+
WORKLOAD=${WORKLOAD:-olm}
34+
QPS=${QPS:-20}
35+
BURST=${BURST:-20}
36+
GC=${GC:-true}
37+
EXTRA_FLAGS=${EXTRA_FLAGS:-}
38+
UUID=${UUID:-$(uuidgen)}
39+
ITERATIONS=${ITERATIONS:-30}
40+
ES_SERVER=${ES_SERVER:-"https://$ES_USERNAME:$ES_PASSWORD@$ES_HOST"}
41+
42+
KUBE_BURNER_URL="https://github.com/kube-burner/kube-burner-ocp/releases/download/v${KUBE_BURNER_VERSION}/kube-burner-ocp-V${KUBE_BURNER_VERSION}-linux-x86_64.tar.gz"
43+
curl --fail --retry 8 --retry-all-errors -sS -L "${KUBE_BURNER_URL}" | tar -xzC "${KUBE_DIR}/" kube-burner-ocp
44+
45+
# git clone https://github.com/kube-burner/kube-burner-ocp.git --branch main --depth 1
46+
# pushd kube-burner-ocp
47+
# make build
48+
# ./bin/amd64/kube-burner-ocp olm -h
3349

3450
# REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking";
3551
# LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name');
@@ -38,20 +54,26 @@ make build
3854
# pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper
3955
# export WORKLOAD=olm
4056

41-
export ITERATIONS=30
42-
export ES_SERVER="https://$ES_USERNAME:$ES_PASSWORD@$ES_HOST"
57+
METADATA=$(cat << EOF
58+
{
59+
"uuid": "${UUID}",
60+
"workload": "${WORKLOAD}",
61+
"mgmtClusterName": "${MC_NAME}",
62+
"hostedClusterName": "${HC_NAME}",
63+
"timestamp": "$(date +%s%3N)"
64+
}
65+
EOF
66+
)
67+
4368

4469
if [[ "${ENABLE_LOCAL_INDEX}" == "true" ]]; then
4570
EXTRA_FLAGS+=" --local-indexing"
4671
fi
4772
EXTRA_FLAGS+=" --gc-metrics=true --profile-type=${PROFILE_TYPE}"
4873

4974
export EXTRA_FLAGS
50-
export ADDITIONAL_PARAMS
51-
52-
export WORKLOAD=olm LOG_LEVEL=debug
5375

54-
cmd="./bin/amd64/kube-burner-ocp ${WORKLOAD} --log-level=${LOG_LEVEL} --qps=${QPS} --burst=${BURST} --gc=${GC} --uuid ${UUID} --iterations=${ITERATIONS}"
76+
cmd="${KUBE_DIR}/kube-burner-ocp ${WORKLOAD} --log-level=${LOG_LEVEL} --qps=${QPS} --burst=${BURST} --gc=${GC} --uuid ${UUID} --iterations=${ITERATIONS}"
5577

5678
# If ES_SERVER is specified
5779
if [[ -n ${ES_SERVER} ]]; then
@@ -70,7 +92,6 @@ fi
7092

7193
# Capture the exit code of the run, but don't exit the script if it fails.
7294
set +e
73-
7495
echo $cmd
7596
JOB_START=${JOB_START:-$(date -u +"%Y-%m-%dT%H:%M:%SZ")};
7697
$cmd
@@ -95,11 +116,9 @@ jq ".iterations = $ITERATIONS" $folder_name/index_data.json >> ${SHARED_DIR}/ind
95116
cp "${SHARED_DIR}"/index_data.json "${SHARED_DIR}"/${WORKLOAD}-index_data.json
96117
cp "${SHARED_DIR}"/${WORKLOAD}-index_data.json "${ARTIFACT_DIR}"/${WORKLOAD}-index_data.json
97118

98-
99119
if [[ "${ENABLE_LOCAL_INDEX}" == "true" ]]; then
100120
metrics_folder_name=$(find . -maxdepth 1 -type d -name 'collected-metric*' | head -n 1)
101121
cp -r "${metrics_folder_name}" "${ARTIFACT_DIR}/"
102122
fi
103123

104124
echo "OLMv1 benchmark test finised"
105-

ci-operator/step-registry/olmv1/performance/olmv1-performance-ref.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ ref:
33
cli: latest
44
from_image:
55
namespace: ci
6-
name: tests-private-burner
7-
tag: "4.19"
6+
name: ocp-qe-perfscale-ci
7+
tag: latest
88
resources:
99
requests:
1010
cpu: 200m

0 commit comments

Comments
 (0)