commit f7a613b3f87e7d54e5421199c526352dd2172930
author A R Karthick <kramanar@ciena.com> Fri Feb 24 09:36:44 2017 -0800
committer A R Karthick <kramanar@ciena.com> Fri Feb 24 09:36:44 2017 -0800
tree 3952a0c960448416984d028bb4f17db75d56320b
parent 1213d4c2f5625edaeeeb09c896e3ec702084a145

Pull cord-tester images from dockerhub as they are available now on dockerhub.
Change image names to be compatible with dockerhub image names.
Update prerequisites.sh last step to pull all the cord-tester docker images.
This should make the cord-test.py build all step redundant now since images should be available for testing immediately after prerequisites.sh are run.

Change-Id: I64cf664a214924349d6728ca2a52974decdef47f

build.gradle

diff --git a/build.gradle b/build.gradle
index 3c9ebb0..c9239f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,7 +67,7 @@
 
     dockerPath = project.hasProperty('dockerPath') ? project.getProperty('dockerPath') : '/usr/bin'
 
-    cordTesterImages = [ 'cord-test/radius:latest' : 'Dockerfile.radius', 'cord-test/quagga:latest' : 'Dockerfile.quagga', 'cord-test/nose:latest' : 'Dockerfile.tester' ]
+    cordTesterImages = [ 'cordtest/radius:candidate' : 'Dockerfile.radius', 'cordtest/quagga:candidate' : 'Dockerfile.quagga', 'cordtest/nose:candidate' : 'Dockerfile.tester' ]
 
 }
 
@@ -121,45 +121,45 @@
 }
 
 task buildRadiusImage(type: Exec) {
-    commandLine "$dockerPath/docker", 'build', '-t', 'cord-test/radius', '-f', 'Dockerfile.radius', '.'
+    commandLine "$dockerPath/docker", 'build', '-t', 'cordtest/radius', '-f', 'Dockerfile.radius', '.'
 }
 
 task tagRadiusImage(type: Exec) {
    dependsOn buildRadiusImage
-   commandLine "$dockerPath/docker", 'tag', 'cord-test/radius', "$targetReg/cord-test/radius:$targetTag"
+   commandLine "$dockerPath/docker", 'tag', 'cordtest/radius', "$targetReg/cordtest/radius:$targetTag"
 }
 
 task publishRadiusImage(type: Exec) {
     dependsOn tagRadiusImage
-    commandLine "$dockerPath/docker", 'push', "$targetReg/cord-test/radius:$targetTag"
+    commandLine "$dockerPath/docker", 'push', "$targetReg/cordtest/radius:$targetTag"
 }
 
 task buildQuaggaImage(type: Exec) {
-    commandLine "$dockerPath/docker", 'build', '-t', 'cord-test/quagga', '-f', 'Dockerfile.quagga', '.'
+    commandLine "$dockerPath/docker", 'build', '-t', 'cordtest/quagga', '-f', 'Dockerfile.quagga', '.'
 }
 
 task tagQuaggaImage(type: Exec) {
    dependsOn buildQuaggaImage
-   commandLine "$dockerPath/docker", 'tag', 'cord-test/quagga', "$targetReg/cord-test/quagga:$targetTag"
+   commandLine "$dockerPath/docker", 'tag', 'cordtest/quagga', "$targetReg/cordtest/quagga:$targetTag"
 }
 
 task publishQuaggaImage(type: Exec) {
     dependsOn tagQuaggaImage
-    commandLine "$dockerPath/docker", 'push', "$targetReg/cord-test/quagga:$targetTag"
+    commandLine "$dockerPath/docker", 'push', "$targetReg/cordtest/quagga:$targetTag"
 }
 
 task buildTesterImage(type: Exec) {
-    commandLine "$dockerPath/docker", 'build', '-t', 'cord-test/nose', '-f', 'Dockerfile.tester', '.'
+    commandLine "$dockerPath/docker", 'build', '-t', 'cordtest/nose', '-f', 'Dockerfile.tester', '.'
 }
 
 task tagTesterImage(type: Exec) {
    dependsOn buildTesterImage
-   commandLine "$dockerPath/docker", 'tag', 'cord-test/nose', "$targetReg/cord-test/nose:$targetTag"
+   commandLine "$dockerPath/docker", 'tag', 'cordtest/nose', "$targetReg/cordtest/nose:$targetTag"
 }
 
 task publishTesterImage(type: Exec) {
     dependsOn tagTesterImage
-    commandLine "$dockerPath/docker", 'push', "$targetReg/cord-test/nose:$targetTag"
+    commandLine "$dockerPath/docker", 'push', "$targetReg/cordtest/nose:$targetTag"
 }
 
 // Publish image(s) built during the build step into targetReg registry using the targetTag