[FAB-11128] Fix devstable pull of chaincoded base

Change-Id: I14aa0b0002baf1d3a4fbedefcfeda1db67a5ef3b
Signed-off-by: Troy Ronda <troy@troyronda.com>

Author: troyronda

test/fixtures/dockerenv/docker-compose-chaincoded.yaml

@@ -20,7 +20,7 @@ services:
           - dockerd.example.com
 
   chaincoded:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
+    image: ${FABRIC_BASE_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
     environment:
       - DOCKER_HOST=http://dockerd.example.com:2375
       #- CORE_CHAINCODE_LOGGING_LEVEL=debug

test/fixtures/dockerenv/docker-compose-negative.yaml

@@ -8,7 +8,7 @@ version: '2'
 services:
 
   integration-tests:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
+    image: ${FABRIC_BASE_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
     environment:
       - GO_TAGS
       - GO_TESTFLAGS

test/fixtures/dockerenv/docker-compose-nopkcs11-test.yaml

@@ -8,7 +8,7 @@ version: '2'
 services:
 
   integration-tests:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
+    image: ${FABRIC_BASE_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
     environment:
       - GO_TAGS
       - GO_TESTFLAGS

test/fixtures/dockerenv/docker-compose-std.yaml

@@ -8,7 +8,7 @@ version: '2'
 services:
 
   chaincoded:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
+    image: ${FABRIC_BASE_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
     command: tail -F anything
     logging:
       driver: none

test/scripts/lib/docker.sh

@@ -9,7 +9,7 @@ function waitForCoreVMUp {
     # When dockerd handles chaincode operation, we need to wait for it to be ready
     # (it takes time to start due to chaincode compilation).
     if [[ "${CORE_VM_ENDPOINT}" =~ http://(.*):(.*) ]]; then
-        declare attempt=0
+        declare attempt=1
         declare host=${BASH_REMATCH[1]}
         declare port=${BASH_REMATCH[2]}
 
@@ -20,7 +20,7 @@ function waitForCoreVMUp {
         echo "Waiting for VM endpoint to listen [${host}:${port}]..."
         while true; do
           if [ ${attempt} -gt 120 ]; then
-            echo "VM endpoint not listening after ${attempt} attempts"
+            echo "VM endpoint is not listening after ${attempt} attempt(s)"
             exit 1
           fi
 
@@ -32,6 +32,6 @@ function waitForCoreVMUp {
           sleep 1
           attempt=$((attempt + 1))
         done
-        echo "VM endpoint is listening after ${attempt} attempts"
+        echo "VM endpoint is listening after ${attempt} attempt(s)"
     fi
 }