airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [airavata-sandbox] 15/19: Fixing minor bugs
Date Wed, 06 Dec 2017 03:13:59 GMT
This is an automated email from the ASF dual-hosted git repository.

smarru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-sandbox.git

commit c0ade6cfa8daf5bfb050811cc5022d5c546a6b75
Author: dimuthu.upeksha2@gmail.com <Dimu@1234>
AuthorDate: Mon Nov 27 00:43:25 2017 +0530

    Fixing minor bugs
---
 .../scripts/docker/jenkins-docker-kubectl-mvn/Dockerfile     |  4 +++-
 airavata-kubernetes/scripts/k8s/ci-cd/Jenkinsfile            | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/airavata-kubernetes/scripts/docker/jenkins-docker-kubectl-mvn/Dockerfile b/airavata-kubernetes/scripts/docker/jenkins-docker-kubectl-mvn/Dockerfile
index 544a9d3..ac9d947 100644
--- a/airavata-kubernetes/scripts/docker/jenkins-docker-kubectl-mvn/Dockerfile
+++ b/airavata-kubernetes/scripts/docker/jenkins-docker-kubectl-mvn/Dockerfile
@@ -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
diff --git a/airavata-kubernetes/scripts/k8s/ci-cd/Jenkinsfile b/airavata-kubernetes/scripts/k8s/ci-cd/Jenkinsfile
index 521de80..98624ce 100644
--- a/airavata-kubernetes/scripts/k8s/ci-cd/Jenkinsfile
+++ b/airavata-kubernetes/scripts/k8s/ci-cd/Jenkinsfile
@@ -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

-- 
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <commits@airavata.apache.org>.

Mime
View raw message