Correcting CI merge.

Author: Thomas Goodwin

.gitlab-ci.yml

@@ -40,12 +40,9 @@ test:
     # Install docker-compose
     - apk add --no-cache py2-pip && pip install docker-compose
 
-    # Change to 'tests', export the test image name, patch the network names
-    # so they're unique in the event of concurrent runs, compose up under a
-    # unique project name and begin executing tests.
+    # Pull the test image and start the stack without rebuilding it.
     - cd tests
-    - export TEST_IMAGE=${CONTAINER_TEST_IMAGE}
-    - sed -i -E "s/TEST_NETWORK/"${CI_COMMIT_REF_SLUG}"/g" docker-compose.yml
+    - docker pull ${CONTAINER_TEST_IMAGE}
     - docker-compose -p ${CI_COMMIT_REF_SLUG} up -d --no-build
     - docker-compose -p ${CI_COMMIT_REF_SLUG} exec -T rest
       bash -l -c 'yum install -y rh.SigGen rh.FileWriter'
@@ -54,7 +51,7 @@ test:
 
     # Clean up and exit with the result
     - docker-compose -p ${CI_COMMIT_REF_SLUG} down
-    - docker rmi $CONTAINER_TEST_IMAGE}
+    - docker rmi ${CONTAINER_TEST_IMAGE}
     - exit ${RESULT}
 
 # Move the test image to internal 'latest' and clean up the worker's images
@@ -92,8 +89,8 @@ deploy-image:
     - docker pull $CONTAINER_RELEASE_IMAGE
     - docker logout
     - docker login -u ${DOCKERHUB_USER} -p ${DOCKERHUB_TOKEN}
-    - docker tag $CONTAINER_RELEASE_IMAGE $dockerhub_image_tag
-    - docker tag $CONTAINER_RELEASE_IMAGE $dockerhub_image_latest
+    - docker tag $CONTAINER_RELEASE_IMAGE ${dockerhub_image_tag}
+    - docker tag $CONTAINER_RELEASE_IMAGE ${dockerhub_image_latest}
     - docker push ${dockerhub_image_tag} ${dockerhub_image_latest}
     - docker rmi ${CONTAINER_RELEASE_IMAGE} ${dockerhub_image_tag} ${dockerhub_image_latest}
 

tests/docker-compose.yml

@@ -5,7 +5,7 @@ services:
     image: geontech/redhawk-omniserver:${REDHAWK_VERSION:-2.0.8}
     hostname: omniorb
     networks:
-      - redhawk-TEST_NETWORK
+      - redhawk
 
   # Standard REDHAWK SDR Domain
   domain:
@@ -17,7 +17,7 @@ services:
       - OMNISERVICEIP=omniorb
       - OMNISERVICEPORTS=19000:19050
     networks:
-      - redhawk-TEST_NETWORK
+      - redhawk
 
   # Standard GPP 
   gpp:
@@ -31,7 +31,7 @@ services:
       - OMNISERVICEIP=omniorb
       - OMNISERVICEPORTS=19100:19150
     networks:
-      - redhawk-TEST_NETWORK
+      - redhawk
 
   # FEI FileReader Device runner mounted to the snapshot.
   fei_file_reader:
@@ -44,11 +44,11 @@ services:
       - OMNISERVICEIP=omniorb
       - OMNISERVICEPORTS=19200:19250
     networks:
-      - redhawk-TEST_NETWORK
+      - redhawk
 
   # REST-Python Unit Under Test (UUT)
   rest:
-    image: ${TEST_IMAGE:-geontech/redhawk-webserver}
+    image: ${CONTAINER_TEST_IMAGE:-geontech/redhawk-webserver}
     build: ../
     depends_on:
       - domain
@@ -58,9 +58,9 @@ services:
       - OMNISERVICEIP=omniorb
     command: [sleep, '3600']
     networks:
-      - redhawk-TEST_NETWORK
-      - web-TEST_NETWORK
+      - redhawk
+      - web
 
 networks:
-  redhawk-TEST_NETWORK:
-  web-TEST_NETWORK:
+  redhawk:
+  web: