diff --git a/README.md b/README.md index 27caae5c..a34b8678 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Automates the installation of OCP on various cloud platforms and runs performanc - Scale-ci-watcher - Scale-ci-linter -![Scale-CI workflow](images/scale-ci-architecture.png) +![Scale-CI workflow](images/scale-ci-workflow.png) ### Properties files diff --git a/images/scale-ci-architecture.png b/images/scale-ci-architecture.png deleted file mode 100644 index 9777e471..00000000 Binary files a/images/scale-ci-architecture.png and /dev/null differ diff --git a/images/scale-ci-workflow.png b/images/scale-ci-workflow.png index 1ecb945a..a4bd8f2e 100644 Binary files a/images/scale-ci-workflow.png and b/images/scale-ci-workflow.png differ diff --git a/jjb/dynamic/scale-ci_ScaleUp_OpenShift.yml b/jjb/dynamic/scale-ci_ScaleUp_OpenShift.yml deleted file mode 100644 index 7ffbe3f2..00000000 --- a/jjb/dynamic/scale-ci_ScaleUp_OpenShift.yml +++ /dev/null @@ -1,148 +0,0 @@ -- job: - auth-token: scale-ci-scaleup - block-downstream: false - block-upstream: false - builders: - - shell: |- - # List the environment variables. - env - set -o pipefail - set -eux - - # Clone the repository that has the performance department's credentials. - git clone https://${GITHUB_TOKEN}@github.com/redhat-performance/perf-dept.git - export PUBLIC_KEY=${WORKSPACE}/perf-dept/ssh_keys/id_rsa_pbench_ec2.pub - export PRIVATE_KEY=${WORKSPACE}/perf-dept/ssh_keys/id_rsa_pbench_ec2 - chmod 600 ${PRIVATE_KEY} - - # Create inventory File: - echo "[undercloud]" > inventory - echo "${OSP_UNDERCLOUD_HOSTNAME}" >> inventory - - export ANSIBLE_FORCE_COLOR=true - ansible-playbook -vv -i inventory scaleup.yml | tee -a artifacts/scaleup.timing - concurrent: true - description: |- - This Jenkins job is part of scale-ci process that automatically installs OpenShift on OpenStack. - - This particular job scales the cluster to the OPENSHIFT_NODE_TARGET. - - It assumes the core cluster is running and healthy, calls a playbook to scale up to the OPENSHIFT_NODE_TARGET. - disabled: false - name: scale-ci_ScaleUp_OpenShift - parameters: - - string: - default: '' - description: The host name or IP address of the server that contains the overcloudrc - file for OpenStack. - name: OPENSTACK_SERVER - - string: - default: '' - description: The user to log into the OpenStack server with. - name: OPENSTACK_USER - - string: - default: '' - description: The host name or IP address of the server that contains the OCP - Virtual Machine images. - name: IMAGE_SERVER - - string: - default: root - description: The user to log into the image server with. - name: IMAGE_USER - - string: - default: '12' - description: The number of OpenShift nodes to scale to. - name: OCP_NODE_TARGET - - string: - default: '60' - description: The total scale is done in smaller chunks of blocks. - name: OCP_SCALE_BLOCK_SIZE - - string: - default: master - description: The branch to use when cloning the scale-ci-ansible repository - from github. Only change this if you need to test changes other than in - the master branch. - name: GIT_BRANCH - - string: - default: '' - description: A space separated list of time servers to use for the VMs after - they are created. The Raleigh lab time servers are much different than the - Boston time servers. - name: OCP_NTP_SERVERS - - raw: - xml: | - - JENKINS_SLAVE_LABEL - - - false - allCases - - - project-type: freestyle - properties: - - build-discarder: - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 - days-to-keep: -1 - num-to-keep: 11 - - raw: - xml: | - - - raw: - xml: | - - - - - raw: - xml: | - - false - - - raw: - xml: | - - - true - akrzos - - nelluri - - - - - raw: - xml: | - - false - false - - - raw: - xml: | - - 0 - 0 - - false - project - false - - - publishers: - - archive: - allow-empty: false - artifacts: artifacts/**/*, inventory - case-sensitive: true - default-excludes: true - fingerprint: false - only-if-success: false - scm: - - git: - branches: - - refs/heads/${GIT_BRANCH} - url: https://github.com/redhat-performance/scale-ci-ansible.git - triggers: [] - wrappers: - - workspace-cleanup: - dirmatch: false - - ansicolor: - colormap: xterm diff --git a/jjb/static/scale-ci-pipeline.yml b/jjb/static/scale-ci-pipeline.yml index 12b60f33..62584d51 100644 --- a/jjb/static/scale-ci-pipeline.yml +++ b/jjb/static/scale-ci-pipeline.yml @@ -147,10 +147,6 @@ default: '' description: '' name: BROWBEAT_PROPERTY_FILE - - string: - default: '' - description: '' - name: OPENSHIFTv3_PROPERTY_FILE - string: default: '' description: '' diff --git a/properties-files/openshiftv3.properties b/properties-files/openshiftv3.properties deleted file mode 100644 index 45500cbb..00000000 --- a/properties-files/openshiftv3.properties +++ /dev/null @@ -1,14 +0,0 @@ -OPENSTACK_SERVER= -OPENSTACK_USER= -IMAGE_SERVER= -IMAGE_USER= -branch= -openshift_cns_flavor= -openshift_infra_flavor= -openshift_master_flavor= -atomic_image= -rhel_image= -openshift_node_flavor= -openshift_registries= -time_servers= -JENKINS_SLAVE_LABEL=