Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sync with prow ci #664

Open
wants to merge 1 commit into
base: cluster-workers-scaling
Choose a base branch
from
Open

sync with prow ci #664

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 27 additions & 13 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,12 @@ OPENSHIFT_ALERTMANAGER_STORAGE_SIZE=20Gi'''
if(env.VARIABLES_LOCATION.indexOf("aws") != -1){
if (architecture_type.contains("arm64")) {
ENV_VARS += '''
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE=m6g.12xlarge
OPENSHIFT_WORKLOAD_NODE_INSTANCE_TYPE=m6g.8xlarge'''
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE=m6g.4xlarge
OPENSHIFT_WORKLOAD_NODE_INSTANCE_TYPE=m6g.4xlarge'''
} else {
ENV_VARS += '''
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE=m5.12xlarge
OPENSHIFT_WORKLOAD_NODE_INSTANCE_TYPE=m5.8xlarge'''
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE=r5.4xlarge
OPENSHIFT_WORKLOAD_NODE_INSTANCE_TYPE=m5.4xlarge'''
}
build job: 'scale-ci/e2e-benchmarking-multibranch-pipeline/cluster-post-config', parameters: [
string(name: 'BUILD_NUMBER', value: BUILD_NUMBER), booleanParam(name: 'HOST_NETWORK_CONFIGS', value:false),
Expand All @@ -208,6 +208,15 @@ OPENSHIFT_WORKLOAD_NODE_VOLUME_TYPE=gp2
OPENSHIFT_WORKLOAD_NODE_VOLUME_SIZE=500
''')]
}else if(env.VARIABLES_LOCATION.indexOf("azure") != -1){
if (architecture_type.contains("arm64")) {
ENV_VARS += '''
OPENSHIFT_INFRA_NODE_VM_SIZE=Standard_D16ps_v5
OPENSHIFT_WORKLOAD_NODE_VM_SIZE=Standard_D8ps_v5'''
} else {
ENV_VARS += '''
OPENSHIFT_INFRA_NODE_VM_SIZE=Standard_D16s_v3
OPENSHIFT_WORKLOAD_NODE_VM_SIZE=Standard_D8s_v3'''
}
build job: 'scale-ci/e2e-benchmarking-multibranch-pipeline/cluster-post-config', parameters: [
string(name: 'BUILD_NUMBER', value: BUILD_NUMBER), booleanParam(name: 'HOST_NETWORK_CONFIGS', value:false),
string(name: 'PROVISION_OR_TEARDOWN', value: 'PROVISION'),
Expand All @@ -219,18 +228,24 @@ OPENSHIFT_WORKLOAD_NODE_VOLUME_SIZE=500
booleanParam(name: 'INSTALL_DITTYBOPPER', value: INSTALL_DITTYBOPPER),
string(name: 'DITTYBOPPER_REPO', value: DITTYBOPPER_REPO),
string(name: 'DITTYBOPPER_REPO_BRANCH', value: DITTYBOPPER_REPO_BRANCH),
string(name: 'DITTYBOPPER_PARAMS', value: DITTYBOPPER_PARAMS),
string(name: 'DITTYBOPPER_PARAMS', value: DITTYBOPPER_PARAMS),
text(name: 'ENV_VARS', value: ENV_VARS + '''
OPENSHIFT_INFRA_NODE_VOLUME_SIZE=128
OPENSHIFT_INFRA_NODE_VOLUME_TYPE=Premium_LRS
OPENSHIFT_INFRA_NODE_VM_SIZE=Standard_D48s_v3
OPENSHIFT_PROMETHEUS_STORAGE_CLASS=managed-csi
OPENSHIFT_ALERTMANAGER_STORAGE_CLASS=managed-csi
OPENSHIFT_WORKLOAD_NODE_VOLUME_SIZE=500
OPENSHIFT_WORKLOAD_NODE_VOLUME_TYPE=Premium_LRS
OPENSHIFT_WORKLOAD_NODE_VM_SIZE=Standard_D32s_v3
''')]
}else if(env.VARIABLES_LOCATION.indexOf("gcp") != -1){
if (architecture_type.contains("arm64")) {
ENV_VARS += '''
OPENSHIFT_INFRA_NODE_VM_SIZE=t2a-standard-16
OPENSHIFT_WORKLOAD_NODE_VM_SIZE=t2a-standard-32'''
} else {
ENV_VARS += '''
OPENSHIFT_INFRA_NODE_VM_SIZE=n1-standard-16
OPENSHIFT_WORKLOAD_NODE_VM_SIZE=n1-standard-32'''
}
build job: 'scale-ci/e2e-benchmarking-multibranch-pipeline/cluster-post-config', parameters: [
string(name: 'BUILD_NUMBER', value: BUILD_NUMBER), booleanParam(name: 'HOST_NETWORK_CONFIGS', value:false),
string(name: 'PROVISION_OR_TEARDOWN', value: 'PROVISION'),
Expand All @@ -246,12 +261,11 @@ OPENSHIFT_WORKLOAD_NODE_VM_SIZE=Standard_D32s_v3
text(name: 'ENV_VARS', value: ENV_VARS + '''
OPENSHIFT_INFRA_NODE_VOLUME_SIZE=100
OPENSHIFT_INFRA_NODE_VOLUME_TYPE=pd-ssd
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE=n1-standard-64
GCP_PROJECT=openshift-qe
GCP_SERVICE_ACCOUNT_EMAIL=openshift-qe.iam.gserviceaccount.com
OPENSHIFT_WORKLOAD_NODE_VOLUME_SIZE=500
OPENSHIFT_WORKLOAD_NODE_VOLUME_TYPE=pd-ssd
OPENSHIFT_WORKLOAD_NODE_INSTANCE_TYPE=n1-standard-32''')
''')
]
} else if(env.VARIABLES_LOCATION.indexOf("vsphere") != -1){
build job: 'scale-ci/e2e-benchmarking-multibranch-pipeline/cluster-post-config', parameters: [
Expand All @@ -266,7 +280,7 @@ OPENSHIFT_WORKLOAD_NODE_INSTANCE_TYPE=n1-standard-32''')
string(name: 'DITTYBOPPER_REPO', value: DITTYBOPPER_REPO),
string(name: 'DITTYBOPPER_REPO_BRANCH', value: DITTYBOPPER_REPO_BRANCH),
string(name: 'DITTYBOPPER_PARAMS', value: DITTYBOPPER_PARAMS),
text(name: 'ENV_VARS', value: ENV_VARS + '''
text(name: 'ENV_VARS', value: ENV_VARS + '''
OPENSHIFT_INFRA_NODE_VOLUME_SIZE=120
OPENSHIFT_INFRA_NODE_CPU_COUNT=48
OPENSHIFT_INFRA_NODE_MEMORY_SIZE=196608
Expand Down Expand Up @@ -327,8 +341,8 @@ OPENSHIFT_ALERTMANAGER_STORAGE_CLASS=ibmc-vpc-block-5iops-tier
booleanParam(name: 'IF_MOVE_MONITORING', value: IF_MOVE_MONITORING),
booleanParam(name: 'IF_MOVE_REGISTRY', value: IF_MOVE_REGISTRY),
text(name: 'ENV_VARS', value: ENV_VARS + '''
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE=ci.m5.xlarge
OPENSHIFT_WORKLOAD_NODE_INSTANCE_TYPE=ci.m5.large
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE=ci.m1.xlarge
OPENSHIFT_WORKLOAD_NODE_INSTANCE_TYPE=ci.m1.xlarge
''')]
}else {
echo "Cloud type is not set up yet"
Expand Down