updated description. Fixes issue cloud-bulldozer#72

piyushgupta1551 · Apr 21, 2020 · 679ac81 · 679ac81
1 parent d6cbe24
commit 679ac81
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/jjb/dynamic/scale-ci_baseline.yml b/jjb/dynamic/scale-ci_baseline.yml
@@ -142,15 +142,15 @@
         trim: 'false'
     - string:
         default: "github.com/redhat-performance/perf-dept.git"
-        description: 'Repository container ssh keys for Ansible and pbench server'
+        description: 'Repository containing ssh keys for Ansible and pbench server'
         name: SSHKEY_REPO
     - string:
         default: "perf-dept/ssh_keys/id_rsa_perf.pub"
-        description: 'path to public key file'
+        description: 'path to public key file in ssh key repository'
         name: SSHKEY_REPOPATH_PUB
     - string:
         default: "perf-dept/ssh_keys/id_rsa_perf"
-        description: 'path to private key file'
+        description: 'path to private key file in ssh key repository'
         name: SSHKEY_REPOPATH_PRIV
 
     project-type: freestyle

diff --git a/pipeline-scripts/baseline.groovy b/pipeline-scripts/baseline.groovy
@@ -26,6 +26,9 @@ stage ('baseline_scale_test') {
 			def cluster_password = baseline_properties['CLUSTER_PASSWORD']
 			def cluster_api_url = baseline_properties['CLUSTER_API_URL']
 			def sshkey_token = baseline_properties['SSHKEY_TOKEN']
+			def sshkey_repo = baseline_properties['SSHKEY_REPO']
+			def sshkey_repopath_pub = baseline_properties['SSHKEY_REPOPATH_PUB']
+			def sshkey_repopath_priv = baseline_properties['SSHKEY_REPOPATH_PRIV']   
 			def orchestration_host = baseline_properties['ORCHESTRATION_HOST']
 			def orchestration_user = baseline_properties['ORCHESTRATION_USER']
 			def workload_image = baseline_properties['WORKLOAD_IMAGE']
@@ -49,6 +52,9 @@ stage ('baseline_scale_test') {
 						[$class: 'StringParameterValue', name: 'CLUSTER_PASSWORD', value: cluster_password ],
 						[$class: 'StringParameterValue', name: 'CLUSTER_API_URL', value: cluster_api_url ],
 						[$class: 'StringParameterValue', name: 'SSHKEY_TOKEN', value: sshkey_token ],
+						[$class: 'StringParameterValue', name: 'SSHKEY_REPO', value: sshkey_repo ],
+						[$class: 'StringParameterValue', name: 'SSHKEY_REPOPATH_PUB', value: sshkey_repopath_pub ],
+						[$class: 'StringParameterValue', name: 'SSHKEY_REPOPATH_PRIV', value: sshkey_repopath_priv ],
 						[$class: 'StringParameterValue', name: 'ORCHESTRATION_HOST', value: orchestration_host ],
 						[$class: 'StringParameterValue', name: 'ORCHESTRATION_USER', value: orchestration_user ],
 						[$class: 'StringParameterValue', name: 'WORKLOAD_IMAGE', value: workload_image ],

diff --git a/properties-files/baseline.properties b/properties-files/baseline.properties
@@ -3,6 +3,9 @@ CLUSTER_USER=kubeadmin
 CLUSTER_PASSWORD=
 CLUSTER_API_URL=
 SSHKEY_TOKEN=
+SSHKEY_REPO=github.com/redhat-performance/perf-dept.git
+SSHKEY_REPOPATH_PUB=perf-dept/ssh_keys/id_rsa_perf.pub
+SSHKEY_REPOPATH_PRIV=perf-dept/ssh_keys/id_rsa_perf
 ORCHESTRATION_HOST=localhost
 ORCHESTRATION_USER=root
 WORKLOAD_IMAGE=quay.io/openshift-scale/scale-ci-workload