commit a7187432528722a4c95c771d1d04bf3c792bd381
author Kailash Khalasi <kailash@onlab.us> Mon Jul 16 10:34:06 2018 -0700
committer Kailash Khalasi <kailash@onlab.us> Mon Jul 16 10:34:06 2018 -0700
tree a3157045c1d52a137fb9497fc1779ca033fb2e92
parent 17b293dfdaed88a7c58ad54914ee7d14ab0d7bba

fixing k8install test

Change-Id: I78026121acabb2c1ef2db32425465c81823541db

jjb/k8install.yaml

diff --git a/jjb/k8install.yaml b/jjb/k8install.yaml
index b35b41d..cd6d5f3 100644
--- a/jjb/k8install.yaml
+++ b/jjb/k8install.yaml
@@ -54,6 +54,11 @@
          default: 'kubernetes-configs/flex-onf-pod1.yml'
          description: 'The deployment config file'
 
+      - string:
+         name: podName
+         default: 'flex-onf-pod1'
+         description: 'Name of pod'
+
     project-type: pipeline
     concurrent: false
 

jjb/pipeline/kubespray-install.groovy

diff --git a/jjb/pipeline/kubespray-install.groovy b/jjb/pipeline/kubespray-install.groovy
index 607a6c4..dfe9820 100644
--- a/jjb/pipeline/kubespray-install.groovy
+++ b/jjb/pipeline/kubespray-install.groovy
@@ -35,7 +35,7 @@
       steps {
         sh """
             pushd $WORKSPACE/automation-tools/kubespray-installer
-            ./setup.sh -i flex-onf-pod1 ${deployment_config.node1.ip} ${deployment_config.node2.ip} ${deployment_config.node3.ip}
+            ./setup.sh -i ${podName} ${deployment_config.node1.ip} ${deployment_config.node2.ip} ${deployment_config.node3.ip}
             popd
             """
             }
@@ -44,9 +44,9 @@
     stage ('Validate Kube Config File') {
       steps {
         sh """
-            pushd $WORKSPACE/automation-tools/kubespray-installer/configs
+            pushd $WORKSPACE/automation-tools/kubespray-installer
             ls -al
-            export KUBECONFIG=$WORKSPACE/automation-tools/kubespray-installer/configs/${deployment_config.pod_config}
+            source setup.sh -s ${podName}
             kubectl get pods
             popd
             """