From c25795d3fcf4f478507f634417c952582b334b80 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 8 Mar 2017 15:18:21 -0500 Subject: [PATCH 1/2] Rebuild unit-test image for every branch This variable is set by Jenkins, you'll have to set it manually if you build locally. --- tools/docker-compose/unit-tests/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker-compose/unit-tests/docker-compose.yml b/tools/docker-compose/unit-tests/docker-compose.yml index 6cb9096ec9..76a4a40342 100644 --- a/tools/docker-compose/unit-tests/docker-compose.yml +++ b/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 From afb5658376fc9710437f184fac32f9afb650f164 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 8 Mar 2017 15:18:52 -0500 Subject: [PATCH 2/2] Remove npm hacks from unit-test-runner This hasnt been necessary for a while, just forgot it was here.. --- tools/docker-compose/unit-tests/Dockerfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tools/docker-compose/unit-tests/Dockerfile b/tools/docker-compose/unit-tests/Dockerfile index 4658c5d32e..d1fec4e583 100644 --- a/tools/docker-compose/unit-tests/Dockerfile +++ b/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