Skip to content

Commit

Permalink
add ingress scale and optional tunning test case
Browse files Browse the repository at this point in the history
  • Loading branch information
qiliRedHat committed Jan 23, 2025
1 parent ad431ee commit 8f2442e
Show file tree
Hide file tree
Showing 6 changed files with 122 additions and 70 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,25 @@ tests:
test:
- chain: openshift-svt-regression-one
workflow: openshift-qe-installer-aws
- always_run: false
as: ingress-scale-test
steps:
allow_skip_on_success: true
cluster_profile: aws-perfscale-qe
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "9"
COMPUTE_NODE_TYPE: m5.2xlarge
IF_MOVE_INGRESS: "false"
IF_MOVE_MONITORING: "false"
IF_MOVE_REGISTRY: "false"
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: c5.4xlarge
SCRIPT: perfscale_regression_ci/scripts/scalability/ingress-scale/ingress-scale.sh
SCRIPT_1: perfscale_regression_ci/scripts/scalability/ingress-scale/ingress-tunning-options.sh
SET_ENV_BY_PLATFORM: custom
test:
- chain: openshift-svt-regression-one
workflow: openshift-qe-installer-aws
zz_generated_metadata:
branch: master
org: openshift
Expand Down
105 changes: 91 additions & 14 deletions ci-operator/jobs/openshift/svt/openshift-svt-master-presubmits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,96 @@ presubmits:
- ^master$
- ^master-
cluster: build01
context: ci/prow/regression-aws-4.17-nightly-x86-regression-scale-affinity-rules
context: ci/prow/regression-aws-4.18-nightly-x86-ingress-scale-test
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale-qe
ci-operator.openshift.io/variant: regression-aws-4.17-nightly-x86
ci-operator.openshift.io/variant: regression-aws-4.18-nightly-x86
ci.openshift.io/generator: prowgen
job-release: "4.17"
job-release: "4.18"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-svt-master-regression-aws-4.18-nightly-x86-ingress-scale-test
rerun_command: /test regression-aws-4.18-nightly-x86-ingress-scale-test
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=ingress-scale-test
- --variant=regression-aws-4.18-nightly-x86
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )(regression-aws-4.18-nightly-x86-ingress-scale-test|remaining-required),?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build01
context: ci/prow/regression-aws-4.18-nightly-x86-regression-scale-affinity-rules
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale-qe
ci-operator.openshift.io/variant: regression-aws-4.18-nightly-x86
ci.openshift.io/generator: prowgen
job-release: "4.18"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-svt-master-regression-aws-4.17-nightly-x86-regression-scale-affinity-rules
rerun_command: /test regression-aws-4.17-nightly-x86-regression-scale-affinity-rules
name: pull-ci-openshift-svt-master-regression-aws-4.18-nightly-x86-regression-scale-affinity-rules
rerun_command: /test regression-aws-4.18-nightly-x86-regression-scale-affinity-rules
spec:
containers:
- args:
Expand All @@ -83,7 +160,7 @@ presubmits:
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=regression-scale-affinity-rules
- --variant=regression-aws-4.17-nightly-x86
- --variant=regression-aws-4.18-nightly-x86
command:
- ci-operator
image: ci-operator:latest
Expand Down Expand Up @@ -131,26 +208,26 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )(regression-aws-4.17-nightly-x86-regression-scale-affinity-rules|remaining-required),?($|\s.*)
trigger: (?m)^/test( | .* )(regression-aws-4.18-nightly-x86-regression-scale-affinity-rules|remaining-required),?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build01
context: ci/prow/regression-aws-4.17-nightly-x86-regression-scale-loaded-projects
context: ci/prow/regression-aws-4.18-nightly-x86-regression-scale-loaded-projects
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale-qe
ci-operator.openshift.io/variant: regression-aws-4.17-nightly-x86
ci-operator.openshift.io/variant: regression-aws-4.18-nightly-x86
ci.openshift.io/generator: prowgen
job-release: "4.17"
job-release: "4.18"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-svt-master-regression-aws-4.17-nightly-x86-regression-scale-loaded-projects
rerun_command: /test regression-aws-4.17-nightly-x86-regression-scale-loaded-projects
name: pull-ci-openshift-svt-master-regression-aws-4.18-nightly-x86-regression-scale-loaded-projects
rerun_command: /test regression-aws-4.18-nightly-x86-regression-scale-loaded-projects
spec:
containers:
- args:
Expand All @@ -160,7 +237,7 @@ presubmits:
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=regression-scale-loaded-projects
- --variant=regression-aws-4.17-nightly-x86
- --variant=regression-aws-4.18-nightly-x86
command:
- ci-operator
image: ci-operator:latest
Expand Down Expand Up @@ -208,7 +285,7 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )(regression-aws-4.17-nightly-x86-regression-scale-loaded-projects|remaining-required),?($|\s.*)
trigger: (?m)^/test( | .* )(regression-aws-4.18-nightly-x86-regression-scale-loaded-projects|remaining-required),?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ ref:
tag: latest
cli: latest
commands: openshift-svt-regression-one-commands.sh
credentials:
- namespace: test-credentials # this entry injects the custom credential
name: ocp-qe-perfscale-es
mount_path: /secret
env:
- name: PARAMETERS_1
default: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ oc config view
oc projects
python --version

ES_PASSWORD=$(cat "/secret/password")
export ES_PASSWORD
ES_USERNAME=$(cat "/secret/username")
export ES_USERNAME

# If running from the one folder, will reset SCRIPT and PARAMETERS variables
export SCRIPT=${SCRIPT_1:-$SCRIPT}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ ref:
tag: latest
cli: latest
commands: openshift-svt-regression-commands.sh
credentials:
- namespace: test-credentials # this entry injects the custom credential
name: ocp-qe-perfscale-es
mount_path: /secret
env:
- name: PARAMETERS
default: ""
Expand Down

0 comments on commit 8f2442e

Please sign in to comment.