Merge pull request #5672 from shanemcd/unit-test-image-tweaks

Unit test image tweaks

tools/docker-compose/unit-tests/Dockerfile

@@ -7,15 +7,6 @@ RUN yum install -y bzip2 gcc-c++
 # We switch the WORKDIR to /ansible-tower further down.
 WORKDIR "/tmp/"
 
-# Build front-end deps
-
-# https://github.com/npm/npm/issues/9863
-RUN cd $(npm root -g)/npm \
-  && npm install fs-extra \
-  && sed -i -e s/graceful-fs/fs-extra/ -e s/fs\.rename/fs.move/ ./lib/utils/rename.js
-
-RUN npm install -g npm@3.10.7
-
 COPY awx/ui/package.json awx/ui/
 
 RUN npm set progress=false

tools/docker-compose/unit-tests/docker-compose.yml

@@ -5,7 +5,7 @@ services:
     build:
       context: ../../../
       dockerfile: tools/docker-compose/unit-tests/Dockerfile
-    image: gcr.io/ansible-tower-engineering/unit-test-runner:latest
+    image: gcr.io/ansible-tower-engineering/unit-test-runner:${GIT_BRANCH}
     environment:
       SWIG_FEATURES: "-cpperraswarn -includeall -I/usr/include/openssl"
       TEST_DIRS: awx/main/tests/functional awx/main/tests/unit awx/conf/tests awx/sso/tests