commit 4add50cbcd63bd8acaf3c7b83aed67740bfe1da1
author Sergey Kulanov <skulanov@mirantis.com> Tue Nov 29 11:20:42 2016 +0200
committer Sergey Kulanov <skulanov@mirantis.com> Tue Nov 29 11:22:06 2016 +0200
tree 6f264f2e71cc62a66df9ec9a9033706f708466de
parent 74910b64aac9f26f3b24fde319f76f61da6e87d2

Switch confd artifact to new location

confd binary artifact now located in correct place, so let's update
path

Change-Id: Icb134e33bd8a717f023d63bfb0f1051f8d83c5c2

vars/buildCalicoContainers.groovy

diff --git a/vars/buildCalicoContainers.groovy b/vars/buildCalicoContainers.groovy
index 8cb1a9e..bb63549 100644
--- a/vars/buildCalicoContainers.groovy
+++ b/vars/buildCalicoContainers.groovy
@@ -25,11 +25,11 @@
   // calico/felix goes from {artifactoryUrl}/mcp/felix/
   def felixImage = config.felixImage ?: "${artifactoryUrl}/mcp/felix/lastbuild".toURL().text.trim()
 
-  def confdBuildId = config.confdBuildId ?: "${artifactoryUrl}/mcp/confd/lastbuild".toURL().text.trim()
-  def confdUrl = config.confdUrl ?: "${artifactoryUrl}/mcp/confd/confd-${confdBuildId}"
-
   def artifactoryBirdUrl = "https://artifactory.mcp.mirantis.net/artifactory/binary-prod-local"
 
+  def confdBuildId = config.confdBuildId ?: "${artifactoryBirdUrl}/${projectNamespace}/confd/latest".toURL().text.trim()
+  def confdUrl = config.confdUrl ?: "${artifactoryBirdUrl}/${projectNamespace}/confd/confd-${confdBuildId}"
+
   def birdBuildId = config.birdBuildId ?: "${artifactoryBirdUrl}/${projectNamespace}/bird/latest".toURL().text.trim()
   def birdUrl = config.birdUrl ?: "${artifactoryBirdUrl}/${projectNamespace}/bird/bird-${birdBuildId}"
   def bird6Url = config.bird6Url ?: "${artifactoryBirdUrl}/${projectNamespace}/bird/bird6-${birdBuildId}"

vars/buildCalicoContainersNew.groovy

diff --git a/vars/buildCalicoContainersNew.groovy b/vars/buildCalicoContainersNew.groovy
index 1799ca6..d55c6a4 100644
--- a/vars/buildCalicoContainersNew.groovy
+++ b/vars/buildCalicoContainersNew.groovy
@@ -37,11 +37,11 @@
   def buildImage = config.buildImage ?: "${artifactoryUrl}/mcp/libcalico/lastbuild".toURL().text.trim()
   def felixImage = config.felixImage ?: "${artifactoryUrl}/mcp/felix/lastbuild".toURL().text.trim()
 
-  def confdBuildId = config.confdBuildId ?: "${artifactoryUrl}/mcp/confd/lastbuild".toURL().text.trim()
-  def confdUrl = config.confdUrl ?: "${artifactoryUrl}/mcp/confd/confd-${confdBuildId}"
-
   def artifactoryBirdUrl = "https://artifactory.mcp.mirantis.net/artifactory/binary-prod-local"
 
+  def confdBuildId = config.confdBuildId ?: "${artifactoryBirdUrl}/${projectNamespace}/confd/latest".toURL().text.trim()
+  def confdUrl = config.confdUrl ?: "${artifactoryBirdUrl}/${projectNamespace}/confd/confd-${confdBuildId}"
+
   def birdBuildId = config.birdBuildId ?: "${artifactoryBirdUrl}/${projectNamespace}/bird/latest".toURL().text.trim()
   def birdUrl = config.birdUrl ?: "${artifactoryBirdUrl}/${projectNamespace}/bird/bird-${birdBuildId}"
   def bird6Url = config.bird6Url ?: "${artifactoryBirdUrl}/${projectNamespace}/bird/bird6-${birdBuildId}"