From d96195131f80397dbef79dee6df5d58dc51985f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Moser?= Date: Mon, 22 May 2017 11:58:16 +0200 Subject: [PATCH] cloudstack: test: improve startup time, fix network dependency on run (#24876) --- test/utils/docker/cloudstack-simulator/Dockerfile | 4 +++- test/utils/docker/cloudstack-simulator/supervisord.conf | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/utils/docker/cloudstack-simulator/Dockerfile b/test/utils/docker/cloudstack-simulator/Dockerfile index 36483171997..fc137a2a37d 100644 --- a/test/utils/docker/cloudstack-simulator/Dockerfile +++ b/test/utils/docker/cloudstack-simulator/Dockerfile @@ -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 diff --git a/test/utils/docker/cloudstack-simulator/supervisord.conf b/test/utils/docker/cloudstack-simulator/supervisord.conf index 4e8c3effa2d..d9cfd08fbf9 100644 --- a/test/utils/docker/cloudstack-simulator/supervisord.conf +++ b/test/utils/docker/cloudstack-simulator/supervisord.conf @@ -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