External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-25 21:05:03 -02:30
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Unit test image tweaks
This commit is contained in:
Shane McDonald
2017-03-08 15:37:35 -05:00
committed by GitHub
parent 81715446fb afb5658376
commit 3679e9b00c
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/docker-compose/unit-tests/Dockerfile
View File

@@ -7,15 +7,6 @@ RUN yum install -y bzip2 gcc-c++
# We switch the WORKDIR to /ansible-tower further down. # We switch the WORKDIR to /ansible-tower further down.
WORKDIR "/tmp/" 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/ COPY awx/ui/package.json awx/ui/
RUN npm set progress=false RUN npm set progress=false

2
tools/docker-compose/unit-tests/docker-compose.yml
View File

@@ -5,7 +5,7 @@ services:
build: build:
context: ../../../ context: ../../../
dockerfile: tools/docker-compose/unit-tests/Dockerfile 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: environment:
SWIG_FEATURES: "-cpperraswarn -includeall -I/usr/include/openssl" SWIG_FEATURES: "-cpperraswarn -includeall -I/usr/include/openssl"
TEST_DIRS: awx/main/tests/functional awx/main/tests/unit awx/conf/tests awx/sso/tests TEST_DIRS: awx/main/tests/functional awx/main/tests/unit awx/conf/tests awx/sso/tests