commit 563f2f7b20e362411ddd007d1b9a85ce25aeb78a
author Pavel Petrov <ppetrov@mirantis.com> Thu Sep 28 15:14:02 2017 +0300
committer Pavel Petrov <ppetrov@mirantis.com> Thu Sep 28 15:27:39 2017 +0300
tree 5ab6ec4234bd859b5f6e268e103a68fef4328fe4
parent b6fdec9c110c7f7487ba2faf3cf895c02ef66b8a

  Removing libcalico references from
  buildCalicoContainer() as libcalico is
  no longer used in build procedure defined
  in calico/node's Makefile.

Change-Id: I316d32349b7c405e09917c0a9d999e6d95ed23ea

src/com/mirantis/mcp/Calico.groovy

diff --git a/src/com/mirantis/mcp/Calico.groovy b/src/com/mirantis/mcp/Calico.groovy
index b1b3dfd..f4fe9d0 100644
--- a/src/com/mirantis/mcp/Calico.groovy
+++ b/src/com/mirantis/mcp/Calico.groovy
@@ -537,7 +537,6 @@
  *          - imageTag String, tag of images
  *          - nodeImage String, Calico Node image name
  *          - ctlImage String, Calico CTL image name
- *          - buildImage String, Calico Build image name
  *          - felixImage String, Calico Felix image name
  *          - confdBuildId String, Version of Calico Confd
  *          - confdUrl String, URL to Calico Confd
@@ -584,8 +583,6 @@
   def ctlRepo = "${dockerRegistry}/${projectNamespace}/${ctlImage}"
   def ctlName = null
 
-   // calico/build goes from libcalico
-  def buildImage = config.get('buildImage',"${dockerRegistry}/${projectNamespace}/calico/build:latest")
   // calico/felix goes from felix
   def felixImage = config.get('felixImage', "${dockerRegistry}/${projectNamespace}/calico/felix:latest")
 
@@ -597,7 +594,7 @@
   def bird6Url = config.get('bird6Url', "${artifactoryURL}/${projectNamespace}/bird/bird6-${birdBuildId}")
   def birdclUrl = config.get('birdclUrl', "${artifactoryURL}/${projectNamespace}/bird/birdcl-${birdBuildId}")
 
-  
+
   // Configure and build calico/ctl image
   dir("./calicoctl_home"){
     ctlImgTag = config.get('imageTag', git.getGitDescribe(true) + "-" + common.getDatetime())
@@ -606,14 +603,12 @@
     // Add LABELs to dockerfile
     docker.setDockerfileLabels("./calicoctl/Dockerfile.calicoctl",
                                ["docker.imgTag=${ctlImgTag}",
-                                "calico.buildImage=${buildImage}",
                                 "calico.birdclUrl=${birdclUrl}"])
 
     // Start build process
     stage ('Build calico/ctl image'){
 
       withEnv(["CTL_CONTAINER_NAME=${ctlName}",
-               "PYTHON_BUILD_CONTAINER_NAME=${buildImage}",
                "BIRDCL_URL=${birdclUrl}"]){
         sh "make calico/ctl"
       }
@@ -629,7 +624,6 @@
     // Add LABELs to dockerfile
     docker.setDockerfileLabels("./calico_node/Dockerfile",
                                ["docker.imgTag=${nodeImgTag}",
-                                "calico.buildImage=${buildImage}",
                                 "calico.felixImage=${felixImage}",
                                 "calico.confdUrl=${confdUrl}",
                                 "calico.birdUrl=${birdUrl}",
@@ -640,7 +634,6 @@
     stage('Build calico/node'){
 
       withEnv(["NODE_CONTAINER_NAME=${nodeName}",
-               "PYTHON_BUILD_CONTAINER_NAME=${buildImage}",
                "FELIX_CONTAINER_NAME=${felixImage}",
                "CONFD_URL=${confdUrl}",
                "BIRD_URL=${birdUrl}",