cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cloudstack: test: improve startup time, fix network dependency on run (#24876)

Browse source
This commit is contained in:
René Moser 2017-05-22 11:58:16 +02:00 committed by John R Barker
parent e9e661ebbb
commit d96195131f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/utils/docker/cloudstack-simulator/Dockerfile
View file

@ -45,6 +45,8 @@ RUN wget https://github.com/apache/cloudstack/archive/4.9.2.0.tar.gz -O /opt/clo
WORKDIR /opt/cloudstack
RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install
RUN mvn -Pdeveloper -Dsimulator dependency:go-offline
RUN mvn -pl client jetty:run -Dsimulator -Djetty.skip -Dorg.eclipse.jetty.annotations.maxWait=120
RUN (/usr/bin/mysqld_safe &); \
sleep 5; \
@ -53,11 +55,11 @@ RUN (/usr/bin/mysqld_safe &); \
MARVIN_FILE=$(find /opt/cloudstack/tools/marvin/dist/ -name "Marvin*.tar.gz"); \
pip install $MARVIN_FILE;
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY zones.cfg /opt/zones.cfg
COPY nginx_default.conf /etc/nginx/sites-available/default
RUN pip install cs
COPY run.sh /opt/run.sh
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
EXPOSE 8888 8080 8096

2
test/utils/docker/cloudstack-simulator/supervisord.conf
View file

@ -8,7 +8,7 @@ autorestart=true
user=root
[program:cloudstack]
command=/bin/bash -c "mvn -pl client jetty:run -Dsimulator -Dorg.eclipse.jetty.annotations.maxWait=120"
command=/bin/bash -c "mvn -pl client jetty:run-forked -Dsimulator -Dorg.eclipse.jetty.annotations.maxWait=120"
directory=/opt/cloudstack
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0