Merge pull request #38 from chaitanyaenr/scale

Add support to scale OCP 4.x cluster

Jenkinsfile

@@ -6,8 +6,8 @@ def tooling = TOOLING.toString().toUpperCase()
 def run_conformance = CONFORMANCE.toString().toUpperCase()
 def openshiftv4_install = OPENSHIFTv4_INSTALL.toString().toUpperCase()
 def openshiftv3_install = OPENSHIFTv3_INSTALL.toString().toUpperCase()
-def ocpv3_scaleup = OPENSHIFTv3_SCALEUP.toString().toUpperCase()
-def ocpv4_scaleup = OPENSHIFTv4_SCALEUP.toString().toUpperCase()
+def ocpv3_scale = OPENSHIFTv3_SCALE.toString().toUpperCase()
+def ocpv4_scale = OPENSHIFTv4_SCALE.toString().toUpperCase()
 def nodevertical = NODEVERTICAL_SCALE_TEST.toString().toUpperCase()
 def mastervertical = MASTERVERTICAL_SCALE_TEST.toString().toUpperCase()
 def install_openstack = OPENSTACK_INSTALL.toString().toUpperCase()
@@ -68,13 +68,13 @@ node (node_label) {
 	}
 
 	// stage to scaleup the cluster
-	if (ocpv3_scaleup == "TRUE") {
-		load "pipeline-scripts/scaleup.groovy"
+	if (ocpv3_scale == "TRUE") {
+		load "pipeline-scripts/openshiftv3_scale.groovy"
 	}
 
 	// stage to run OCP 4.X scaleup
-	if (ocpv4_scaleup == "TRUE") {
-		load "pipeline-scripts/scaleup_4.x.groovy"
+	if (ocpv4_scale == "TRUE") {
+		load "pipeline-scripts/openshiftv4_scale.groovy"
 	}
 
 	// stage to run nodevertical scale test

README.md

@@ -49,12 +49,12 @@ $ ./scale-ci-linter.sh <path-to-the-template>
 ### Scale-CI Jobs
 Job   | OCP component/category | Description | Managed by scale-ci-watcher | OCP-3.X | OCP-4.X
 ----------------- | --------- | -------------------- | ----------- | ------------------ | ----------- |  
-OpenShift install | Installer | Installs OCP cluster | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |  
 Scale-ci-pipeline | Orchestrator | Orchestrates scale-ci job stages | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 Watcher | Onboards/updates workloads | Creates/updates jobs based on changes to the templates | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+OpenShift install | Installer | Installs OCP cluster | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |  
 Tooling | Tooling | Sets up pbench-agents to collect perf data | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 Conformance | OCP/kubernetes e2e tests | Checks if the OCP cluster is sane | :heavy_check_mark: | :x: | :heavy_check_mark: |  
-Scaleup | scaleup | Scales up OCP cluster to a desired node count | In progress | :heavy_check_mark: | :heavy_check_mark: |  
+Scaleup | scaleup | Scales up OCP cluster to a desired node count | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |  
 Node Vertical | Kubelet performance and Cluster Limits | Creates max pods per compute node | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |  
 Master Vertical | Control plane density | Creates bunch of objects to stress ApiServer, Etcd and Controller | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |  
 Networking | SDN | uperf benchmarks testing node to node, pod to pod, and svc to svc throughput and latency for TCP and UDP protocols | In progress | :heavy_check_mark: | :heavy_check_mark: |  

jjb/dynamic/scale-ci-pipeline.yml

@@ -36,11 +36,11 @@
     - bool:
         default: false
         description: ''
-        name: OPENSHIFTv3_SCALEUP
+        name: OPENSHIFTv3_SCALE
     - bool:
         default: false
         description: ''
-        name: OPENSHIFTv4_SCALEUP
+        name: OPENSHIFTv4_SCALE
     - bool:
         default: false
         description: ''
@@ -128,11 +128,11 @@
     - string:
         default: ''
         description: ''
-        name: OPENSHIFTv3_SCALEUP_PROPERTY_FILE
+        name: OPENSHIFTv3_SCALE_PROPERTY_FILE
     - string:
         default: ''
         description: ''
-        name: OPENSHIFTv4_SCALEUP_PROPERTY_FILE
+        name: OPENSHIFTv4_SCALE_PROPERTY_FILE
     - string:
         default: ''
         description: ''