Fixing minor bugs
authordimuthu.upeksha2@gmail.com <Dimu@1234>
Sun, 26 Nov 2017 19:13:25 +0000 (00:43 +0530)
committerSuresh Marru <smarru@apache.org>
Wed, 6 Dec 2017 03:13:42 +0000 (22:13 -0500)
airavata-kubernetes/scripts/docker/jenkins-docker-kubectl-mvn/Dockerfile
airavata-kubernetes/scripts/k8s/ci-cd/Jenkinsfile

index 544a9d3..ac9d947 100644 (file)
@@ -1,2 +1,4 @@
 FROM chadmoon/jenkins-docker-kubectl:latest
-ADD apache-maven-3.5.2 /opt/maven
\ No newline at end of file
+ADD apache-maven-3.5.2 /opt/maven
+ADD kubectl /usr/local/bin/kubectl
+RUN chmod +x /usr/local/bin/kubectl
\ No newline at end of file
index 521de80..98624ce 100644 (file)
@@ -58,22 +58,22 @@ node {
         sh "sed 's#dimuthuupe/api-server:v1.0#'$BUILDIMG_API_SERVER'#' airavata-kubernetes/scripts/k8s/api-server/api-server-dep.yml | kubectl apply -f -"
         sh "kubectl rollout status deployment/api-server"
 
-        sh "sed 's#dimuthuupe/event-sink:v1.0#'BUILDIMG_EVENT_SINK'#' airavata-kubernetes/scripts/k8s/event-sink/event-sink-dep.yml | kubectl apply -f -"
+        sh "sed 's#dimuthuupe/event-sink:v1.0#'$BUILDIMG_EVENT_SINK'#' airavata-kubernetes/scripts/k8s/event-sink/event-sink-dep.yml | kubectl apply -f -"
         sh "kubectl rollout status deployment/event-sink"
 
-        sh "sed 's#dimuthuupe/helix-controller:v1.0#'BUILDIMG_HELIX_CONTROLLER'#' airavata-kubernetes/scripts/k8s/helix-controller/helix-controller-dep.yml | kubectl apply -f -"
+        sh "sed 's#dimuthuupe/helix-controller:v1.0#'$BUILDIMG_HELIX_CONTROLLER'#' airavata-kubernetes/scripts/k8s/helix-controller/helix-controller-dep.yml | kubectl apply -f -"
         sh "kubectl rollout status deployment/helix-controller"
 
-        sh "sed 's#dimuthuupe/task-scheduler:v1.0#'BUILDIMG_TASK_SCHEDULER'#' airavata-kubernetes/scripts/k8s/task-scheduler/task-scheduler-dep.yml | kubectl apply -f -"
+        sh "sed 's#dimuthuupe/task-scheduler:v1.0#'$BUILDIMG_TASK_SCHEDULER'#' airavata-kubernetes/scripts/k8s/task-scheduler/task-scheduler-dep.yml | kubectl apply -f -"
         sh "kubectl rollout status deployment/task-scheduler"
 
-        sh "sed 's#dimuthuupe/command-task:v1.0#'BUILDIMG_COMMAND_TASK'#' airavata-kubernetes/scripts/k8s/command-task/command-task-dep.yml | kubectl apply -f -"
+        sh "sed 's#dimuthuupe/command-task:v1.0#'$BUILDIMG_COMMAND_TASK'#' airavata-kubernetes/scripts/k8s/command-task/command-task-dep.yml | kubectl apply -f -"
         sh "kubectl rollout status deployment/command-task"
 
-        sh "sed 's#dimuthuupe/data-in-task:v1.0#'BUILDIMG_DATA_IN_TASK'#' airavata-kubernetes/scripts/k8s/data-in-task/data-in-task-dep.yml | kubectl apply -f -"
+        sh "sed 's#dimuthuupe/data-in-task:v1.0#'$BUILDIMG_DATA_IN_TASK'#' airavata-kubernetes/scripts/k8s/data-in-task/data-in-task-dep.yml | kubectl apply -f -"
         sh "kubectl rollout status deployment/data-in-task"
 
-        sh "sed 's#dimuthuupe/data-out-task:v1.0#'BUILDIMG_DATA_OUT_TASK'#' airavata-kubernetes/scripts/k8s/data-out-task/data-out-task-dep.yml | kubectl apply -f -"
+        sh "sed 's#dimuthuupe/data-out-task:v1.0#'$BUILDIMG_DATA_OUT_TASK'#' airavata-kubernetes/scripts/k8s/data-out-task/data-out-task-dep.yml | kubectl apply -f -"
         sh "kubectl rollout status deployment/data-out-task"
 
 }
\ No newline at end of file