[Rt-commit] rt branch, 4.4/docker-tests, updated. rt-4.4.4-92-g433a18358
Jim Brandt
jbrandt at bestpractical.com
Fri Feb 28 11:23:08 EST 2020
The branch, 4.4/docker-tests has been updated
via 433a18358cc4f79d602ba4cde369422eedadab9d (commit)
from 1ba7a6d2a6bb613a8f00745bb40e1a48359e436b (commit)
Summary of changes:
.travis.yml | 6 ++++--
Dockerfile | 31 +++++++++++++------------------
2 files changed, 17 insertions(+), 20 deletions(-)
- Log -----------------------------------------------------------------
commit 433a18358cc4f79d602ba4cde369422eedadab9d
Author: Jim Brandt <jbrandt at bestpractical.com>
Date: Fri Feb 28 11:22:35 2020 -0500
Use travis checkout and enable parallel tests
diff --git a/.travis.yml b/.travis.yml
index 1fb82c7d1..040c081b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
language: bash
services: docker
+# $TRAVIS_BUILD_DIR will have a clone of the current branch
before_install:
- docker build -t rt44 .
- - docker run -d --name rt rt44
+ - docker run -d -v $TRAVIS_BUILD_DIR:/rt --name rt rt44
- docker ps -a
+ - docker exec -it rt bash -c "cd /rt && ./configure.ac --with-db-type=SQLite --with-my-user-group --enable-layout=inplace --enable-developer --enable-developer --enable-externalauth --disable-gpg --disable-smime && mkdir -p /rt/var && make testdeps"
script:
- - docker exec -it rt bash -c "cd /usr/local/rt && prove -l t/*"
+ - docker exec -it rt bash -c "cd /rt && prove -lj9 t/*"
diff --git a/Dockerfile b/Dockerfile
index 8a86b3e3f..0f1b0838a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
FROM netsandbox/request-tracker-base
ENV RT_BRANCH 4.4/docker-tests
+ENV RT_TEST_PARALLEL 1
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
git \
@@ -9,22 +10,22 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
libencode-hanextra-perl \
&& rm -rf /var/lib/apt/lists/*
-RUN cd /usr/local/ \
- && git clone https://github.com/bestpractical/rt.git \
- && cd rt \
- && git checkout "${RT_BRANCH}" \
- && ./configure.ac \
- --with-db-type=SQLite --with-my-user-group --enable-layout=inplace --enable-developer \
- --enable-developer --enable-externalauth --disable-gpg --disable-smime \
- && make testdeps
+#RUN cd /usr/local/ \
+# && git clone https://github.com/bestpractical/rt.git \
+# && cd rt \
+# && git checkout "${RT_BRANCH}" \
+# && ./configure.ac \
+# --with-db-type=SQLite --with-my-user-group --enable-layout=inplace --enable-developer \
+# --enable-developer --enable-externalauth --disable-gpg --disable-smime \
+# && make testdeps
# && make initdb
-RUN mkdir -p /usr/local/rt/var
+#RUN mkdir -p /usr/local/rt/var
-COPY t/data/configs/docker+apache2.4+fcgid.conf /etc/apache2/sites-available/rt.conf
-RUN a2dissite 000-default.conf && a2ensite rt.conf
+#COPY t/data/configs/docker+apache2.4+fcgid.conf /etc/apache2/sites-available/rt.conf
+#RUN a2dissite 000-default.conf && a2ensite rt.conf
-RUN chown -R www-data:www-data /usr/local/rt/var/
+#RUN chown -R www-data:www-data /usr/local/rt/var/
# COPY RT_SiteConfig.pm /opt/rt4/etc/RT_SiteConfig.pm
@@ -35,9 +36,3 @@ RUN chown -R www-data:www-data /usr/local/rt/var/
# ENTRYPOINT ["docker-entrypoint.sh"]
# CMD ["apache2-foreground"]
-
-#RUN cd /usr/local/rt \
-# && prove -l t/00-compile.t \
-# && prove -l t/00-mason-syntax.t \
-# && prove -l t/99-policy.t \
-# && prove -l t/web/ticket-display.t
-----------------------------------------------------------------------
More information about the rt-commit
mailing list