Skip to content

Commit a5f4f28

Browse files
committedFeb 12, 2016
Fix provisioning for karma tests
1 parent 20197a9 commit a5f4f28

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed
 

‎Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ COPY ./provision/docker/vagrant.bashrc /home/vagrant/.bashrc
4444

4545
WORKDIR /vagrant
4646

47-
COPY ./package.json /vagrant/
48-
RUN npm install -g \
49-
&& ln -s /usr/local/lib/node_modules/ggrc-core/node_modules/karma/bin/karma /usr/bin/karma
47+
COPY ./package.json /vagrant-dev/
48+
RUN cd /vagrant-dev \
49+
&& npm install
5050

5151
RUN gem install sass -v 3.2.13 \
5252
&& gem install compass -v 0.12.2

‎bin/jenkins/functions.sh

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ setup () {
6868
docker exec -i ${PROJECT}_dev_1 su vagrant -c "
6969
source /vagrant/bin/init_vagrant_env
7070
make bower_components > /dev/null
71+
ln -s /vagrant-dev/node_modules /vagrant/node_modules
7172
build_compass
7273
build_assets
7374
"

‎bin/jenkins/run_unittests

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ docker exec -id ${PROJECT}_selenium_1 python /selenium/bin/chrome_karma.py
3838

3939
docker exec -i ${PROJECT}_dev_1 su vagrant -c "
4040
source /vagrant/bin/init_vagrant_env
41-
/usr/local/lib/node_modules/ggrc-core/node_modules/karma/bin/karma start \\
41+
/vagrant/node_modules/karma/bin/karma start \\
4242
/vagrant/karma.conf.js --single-run --reporters dots,junit
4343
" && karma_rc=$? || karma_rc=$?
4444

‎docker-compose-testing.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dev:
88
privileged: true
99
environment:
1010
- PYTHONDONTWRITEBYTECODE=true
11-
- NODE_PATH=/usr/local/lib/node_modules/
11+
- NODE_PATH=/vagrant-dev/node_modules/
1212

1313
selenium:
1414
build: .

‎docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dev:
1212
privileged: true
1313
environment:
1414
- PYTHONDONTWRITEBYTECODE=true
15-
- NODE_PATH=/usr/local/lib/node_modules/
15+
- NODE_PATH=/vagrant-dev/node_modules/
1616

1717
selenium:
1818
build: .

0 commit comments

Comments
 (0)