[Rt-commit] rt branch, 4.4/add-postgresql-apache-fcgid-tests2, updated. rt-4.4.4-201-gcd333068e2

[Jim Brandt]

The branch, 4.4/add-postgresql-apache-fcgid-tests2 has been updated
       via  cd333068e2d381f69204c94d5e226533258ee19c (commit)
       via  f7de6bbf191a520358d205a657b435ada48c2f5f (commit)
       via  a1fcf06a5312ed61ce2d9506afdacdcf6eee5fd4 (commit)
      from  8d8cb3eaf7aa1764ddfc50f68972b0c003ca532f (commit)

Summary of changes:
 .travis.yml           | 43 +++++++++++++++++++++++++++++++------------
 lib/RT/Test/Apache.pm |  2 +-
 2 files changed, 32 insertions(+), 13 deletions(-)

- Log -----------------------------------------------------------------
commit a1fcf06a5312ed61ce2d9506afdacdcf6eee5fd4
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Dec 24 09:38:32 2020 -0500

    Lower parallel count to test reducing test time

diff --git a/.travis.yml b/.travis.yml
index 642b4bbd82..989da3a1b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,4 +18,4 @@ before_install:
   - docker exec -e USER=rt-user -u rt-user -it rt bash -c "cd /rt && ./configure.ac --with-db-type=mysql --with-my-user-group --enable-layout=inplace --with-web-handler=fcgid --enable-developer --enable-externalauth --enable-gpg --enable-smime && mkdir -p /rt/var && make testdeps && chmod a+rX /rt/sbin/*"
 
 script:
-    - docker exec -u rt-user -it rt bash -c "cd /rt && prove -lj9 t/*"
+    - docker exec -u rt-user -it rt bash -c "cd /rt && prove -lj8 t/*"

commit f7de6bbf191a520358d205a657b435ada48c2f5f
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Dec 24 09:54:03 2020 -0500

    Use prefork since that is the preferred mpm for RT

diff --git a/lib/RT/Test/Apache.pm b/lib/RT/Test/Apache.pm
index 991c10d7ba..521d34561d 100644
--- a/lib/RT/Test/Apache.pm
+++ b/lib/RT/Test/Apache.pm
@@ -58,7 +58,7 @@ my %MODULES = (
     '2.4' => {
         "mod_perl" => [qw(mpm_worker authz_core authn_core authz_host env alias perl)],
         "fastcgi"  => [qw(mpm_worker authz_core authn_core authz_host env alias mime fastcgi)],
-        "fcgid"  => [qw(mpm_worker authz_core authn_core authz_host env alias mime fcgid)],
+        "fcgid"  => [qw(mpm_prefork authz_core authn_core authz_host env alias mime fcgid)],
     },
 );
 

commit cd333068e2d381f69204c94d5e226533258ee19c
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Dec 24 10:01:02 2020 -0500

    Add parallel travis SQLite test run with RTs web server

diff --git a/.travis.yml b/.travis.yml
index 989da3a1b8..39efa654e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,17 +5,36 @@ notifications:
   slack:
     secure: ebb/6lbr1ob7wMh04C5PzM5/NNz6IstEUaUROA7BATuKKgPetl6qwmQNwvlwE5zYvJQBWQwKJ70JaCzJkXK6JVMVRRAWsXINJTzMfSqsoXEcJ59c5isf0bsnspVO7jxHTfXF/NZngR4EuPwH5v5lWp9m++j90t9nBKFFVi34WUE=
 
-env:
-  - RT_TEST_PARALLEL=1 RT_DBA_USER=root RT_DBA_PASSWORD=password DB_VERSION_TAG=10.3 RT_TEST_WEB_HANDLER=apache+fcgid HTTPD_ROOT=/etc/apache2 RT_TEST_APACHE=/usr/sbin/apache2 RT_TEST_APACHE_MODULES=/usr/lib/apache2/modules
+jobs:
+  include:
+  - stage: test
+    name: Test SQLite with RT web server
+    env:
+      - RT_TEST_PARALLEL=1 RT_DBA_USER=root RT_DBA_PASSWORD=password
 
-# $TRAVIS_BUILD_DIR will have a clone of the current branch
-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 ps -a
-  - docker exec -it rt bash -c "chown -R rt-user /rt; touch /etc/apache2/mime.types"
-  - docker exec -e USER=rt-user -u rt-user -it rt bash -c "cd /rt && ./configure.ac --with-db-type=mysql --with-my-user-group --enable-layout=inplace --with-web-handler=fcgid --enable-developer --enable-externalauth --enable-gpg --enable-smime && mkdir -p /rt/var && make testdeps && chmod a+rX /rt/sbin/*"
+    # $TRAVIS_BUILD_DIR will have a clone of the current branch
+    before_install:
+      - docker build -t rt-base .
+      - docker run -d -v $TRAVIS_BUILD_DIR:/rt --name rt
+      - 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-externalauth --enable-gpg --enable-smime && mkdir -p /rt/var && make testdeps"
 
-script:
-    - docker exec -u rt-user -it rt bash -c "cd /rt && prove -lj8 t/*"
+    script:
+        - docker exec -u rt-user -it rt bash -c "cd /rt && prove -lj8 t/*"
+
+  - stage: test
+    name: Test MariaDB with Apache
+    env:
+      - RT_TEST_PARALLEL=1 RT_DBA_USER=root RT_DBA_PASSWORD=password DB_VERSION_TAG=10.3 RT_TEST_WEB_HANDLER=apache+fcgid HTTPD_ROOT=/etc/apache2 RT_TEST_APACHE=/usr/sbin/apache2 RT_TEST_APACHE_MODULES=/usr/lib/apache2/modules
+
+    # $TRAVIS_BUILD_DIR will have a clone of the current branch
+    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 ps -a
+      - docker exec -it rt bash -c "chown -R rt-user /rt; touch /etc/apache2/mime.types"
+      - docker exec -e USER=rt-user -u rt-user -it rt bash -c "cd /rt && ./configure.ac --with-db-type=mysql --with-my-user-group --enable-layout=inplace --with-web-handler=fcgid --enable-developer --enable-externalauth --enable-gpg --enable-smime && mkdir -p /rt/var && make testdeps && chmod a+rX /rt/sbin/*"
+
+    script:
+        - docker exec -u rt-user -it rt bash -c "cd /rt && prove -lj8 t/*"

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