[Rt-commit] rt branch, 4.4/run-travis-tests-on-postgresql, updated. rt-4.4.4-134-ge5b4a9e0ea

[Dianne Skoll]

The branch, 4.4/run-travis-tests-on-postgresql has been updated
       via  e5b4a9e0ea3f0828a5008b2b09a449e7e9a47fdb (commit)
      from  5815db3194ec044d291b03002944fa466699d315 (commit)

Summary of changes:
 .travis.yml | 12 ++++++------
 Dockerfile  |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit e5b4a9e0ea3f0828a5008b2b09a449e7e9a47fdb
Author: Dianne Skoll <dianne at bestpractical.com>
Date:   Fri Aug 7 17:17:59 2020 -0400

    Eliminate interference between parallel test jobs:
    
    o Run tests in a non-shared directory /rt.nonshared
    o Pass in RT_DBA_USER and RT_DBA_PASSWORD on "docker run" commandline.

diff --git a/.travis.yml b/.travis.yml
index edf4be5fda..998bfa3ede 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,13 +17,13 @@ jobs:
     before_install:
       - docker run --name postgresql --mount type=tmpfs,destination=/var/lib/postgresql/data -e POSTGRES_PASSWORD=password -d postgres:$DB_VERSION_TAG
       - docker build -t rt-base .
-      - docker run -d -v $TRAVIS_BUILD_DIR:/rt --name rt --link postgresql:db rt-base
+      - docker run -d -e RT_DBA_USER=postgres -e RT_DBA_PASSWORD=password -v $TRAVIS_BUILD_DIR:/rt --name rt --link postgresql:db rt-base
       - docker ps -a
       - docker exec -it rt bash -c "apt-get update && apt-get install -y libdbd-pg-perl"
-      - docker exec -it rt bash -c "cd /rt && ./configure.ac --with-db-type=Pg --with-my-user-group --enable-layout=inplace --enable-developer --enable-externalauth --disable-gpg --disable-smime && mkdir -p /rt/var && make testdeps"
+      - docker exec -it rt bash -c "cp -a /rt /rt.nonshared && cd /rt.nonshared && ./configure.ac --with-db-type=Pg --with-my-user-group --enable-layout=inplace --enable-developer --enable-externalauth --disable-gpg --disable-smime && mkdir -p /rt.nonshared/var && make testdeps"
 
     script:
-        - docker exec -it rt bash -c "cd /rt && prove -lj9 t/*"
+        - docker exec -it rt bash -c "cd /rt.nonshared && prove -lj9 t/*"
 
   - stage: test
     env:
@@ -33,9 +33,9 @@ jobs:
     before_install:
       - docker run --name mariadb -e MYSQL_ROOT_PASSWORD=password -d mariadb:$DB_VERSION_TAG
       - docker build -t rt-base .
-      - docker run -d -v $TRAVIS_BUILD_DIR:/rt --name rt --link mariadb:db rt-base
+      - docker run -d -e RT_DBA_USER=root -e RT_DBA_PASSWORD=password -v $TRAVIS_BUILD_DIR:/rt --name rt --link mariadb:db rt-base
       - docker ps -a
-      - docker exec -it rt bash -c "cd /rt && ./configure.ac --with-db-type=mysql --with-my-user-group --enable-layout=inplace --enable-developer --enable-externalauth --disable-gpg --disable-smime && mkdir -p /rt/var && make testdeps"
+      - docker exec -it rt bash -c "cp -a /rt /rt.nonshared && cd /rt.nonshared && ./configure.ac --with-db-type=mysql --with-my-user-group --enable-layout=inplace --enable-developer --enable-externalauth --disable-gpg --disable-smime && mkdir -p /rt.nonshared/var && make testdeps"
 
     script:
-        - docker exec -it rt bash -c "cd /rt && prove -lj9 t/*"
+        - docker exec -it rt bash -c "cd /rt.nonshared && prove -lj9 t/*"
diff --git a/Dockerfile b/Dockerfile
index a23d7f1df5..fc61e51e43 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,10 @@ FROM bpssysadmin/rt-base-debian-stretch
 
 ENV RT_TEST_PARALLEL 1
 ENV RT_TEST_DEVEL 1
-ENV RT_DBA_USER postgres
-ENV RT_DBA_PASSWORD password
+
+# The next two should be passed in on the "docker run" command-line
+#ENV RT_DBA_USER postgres
+#ENV RT_DBA_PASSWORD password
 ENV RT_TEST_DB_HOST=172.17.0.2
 ENV RT_TEST_RT_HOST=172.17.0.3
 

-----------------------------------------------------------------------