Correctly return calico names to system-test

* CALICO_NODE_IMAGE_REPO
* CALICOCTL_IMAGE_REPO

Change-Id: Ia937bd9f6a6c13ffba4bce0beaabc215ad99fe07
diff --git a/vars/buildCalicoContainersNew.groovy b/vars/buildCalicoContainersNew.groovy
index 5471840..fc7bd6f 100644
--- a/vars/buildCalicoContainersNew.groovy
+++ b/vars/buildCalicoContainersNew.groovy
@@ -89,8 +89,8 @@
   return [
     CTL_CONTAINER_NAME:"${ctlName}",
     NODE_CONTAINER_NAME:"${nodeName}",
-    CALICO_NODE_IMAGE:"${projectNamespace}/${nodeImage}",
-    CALICO_CTL_IMAGE:"${projectNamespace}/${ctlImage}",
+    CALICO_NODE_IMAGE_REPO:"${nodeImage}",
+    CALICOCTL_IMAGE_REPO:"${ctlImage}",
     CALICO_VERSION: "${imgTag}"
   ]