From commits-return-18623-apmail-airavata-commits-archive=airavata.apache.org@airavata.apache.org Wed Dec 6 03:14:24 2017 Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C5DD517B4C for ; Wed, 6 Dec 2017 03:14:23 +0000 (UTC) Received: (qmail 21197 invoked by uid 500); 6 Dec 2017 03:14:09 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 21045 invoked by uid 500); 6 Dec 2017 03:14:06 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 19815 invoked by uid 99); 6 Dec 2017 03:13:48 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Dec 2017 03:13:48 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A54C38209A; Wed, 6 Dec 2017 03:13:46 +0000 (UTC) Date: Wed, 06 Dec 2017 03:13:59 +0000 To: "commits@airavata.apache.org" Subject: [airavata-sandbox] 15/19: Fixing minor bugs MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: smarru@apache.org In-Reply-To: <151253002492.6961.4711355333669269177@gitbox.apache.org> References: <151253002492.6961.4711355333669269177@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: airavata-sandbox X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: c0ade6cfa8daf5bfb050811cc5022d5c546a6b75 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171206031346.A54C38209A@gitbox.apache.org> 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 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" .