[Rt-commit] rt branch, 4.4/add-postgresql-apache-fcgid-tests, repushed
Dianne Skoll
dianne at bestpractical.com
Tue Aug 25 08:55:55 EDT 2020
The branch 4.4/add-postgresql-apache-fcgid-tests was deleted and repushed:
was eb8d160f19b5ea754378443182483b11f14eeeac
now c501f6da648dec1b60a2e876e4a72ef491e21a0b
1: e14dbadbe5 ! 1: 185312ad0e Add support for mod_fcgid.
@@ -1,113 +1,11 @@
Author: Dianne Skoll <dianne at bestpractical.com>
- Run three parallel tests on Travis CI: MariaDB, Pg, MariaDB + mod_fcgid
-
- o MariaDB with default web handler
- o PostgreSQL with default web handler
- o MariaDB with Apache and mod_fcgid
-
-diff --git a/.travis.yml b/.travis.yml
---- a/.travis.yml
-+++ b/.travis.yml
-@@
- language: bash
- services: docker
-+os: linux
-+dist: xenial
-
- 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
-+jobs:
-+ include:
-+ - stage: test
-+ name: Test against PostgreSQL
-+ env:
-+ - RT_TEST_PARALLEL=1 RT_DBA_USER=postgres RT_DBA_PASSWORD=password DB_VERSION_TAG=9.6
-
- # $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 "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"
--
--script:
-- - docker exec -it rt bash -c "cd /rt && prove -lj9 t/*"
-+ 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 -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"
-+
-+ script:
-+ - docker exec -it rt bash -c "cd /rt && prove -lj9 t/*"
-+
-+ - stage: test
-+ name: Test against MariaDB
-+ env:
-+ - RT_TEST_PARALLEL=1 RT_DBA_USER=root RT_DBA_PASSWORD=password DB_VERSION_TAG=10.3
-+
-+# $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 -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"
-+
-+ script:
-+ - docker exec -it rt bash -c "cd /rt && prove -lj9 t/*"
-+
-+ - stage: test
-+ name: Test against MariaDB and Apache with mod_fcgid
-+ env:
-+ - RT_TEST_PARALLEL=1 RT_DBA_USER=root RT_DBA_PASSWORD=password DB_VERSION_TAG=10.3
-+
-+# $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 -e RT_DBA_USER=root -e RT_DBA_PASSWORD=password -e RT_TEST_WEB_HANDLER=apache+fcgid -e HTTPD_ROOT=/etc/apache2 -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 --with-web-handler=fcgid && mkdir -p /rt/var && make testdeps && touch /etc/apache2/mime.types"
-+
-+ script:
-+ - docker exec -it rt bash -c "cd /rt && prove -lj9 t/*"
-
-diff --git a/Dockerfile b/Dockerfile
---- a/Dockerfile
-+++ b/Dockerfile
-@@
-
- ENV RT_TEST_PARALLEL 1
- ENV RT_TEST_DEVEL 1
--ENV RT_DBA_USER root
--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
-
+ Add support for mod_fcgid.
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@
- AC_ARG_WITH(web-handler,
- AC_HELP_STRING([--with-web-handler=LIST],
- [comma separated list of web-handlers RT will be able to use.
-- Default is fastcgi. Valid values are modperl1, modperl2, fastcgi and standalone.
-+ Default is fastcgi. Valid values are modperl1, modperl2, fastcgi, fcgid and standalone.
- To successfully run RT you need only one.
]),
WEB_HANDLER=$withval,
WEB_HANDLER=fastcgi)
@@ -120,12 +18,10 @@
AC_SUBST(WEB_HANDLER)
@@
- t/data/configs/apache2.2+mod_perl.conf
t/data/configs/apache2.2+fastcgi.conf
t/data/configs/apache2.4+mod_perl.conf
-- t/data/configs/apache2.4+fastcgi.conf],
-+ t/data/configs/apache2.4+fastcgi.conf
-+ t/data/configs/apache2.4+fcgid.conf]
+ t/data/configs/apache2.4+fastcgi.conf],
++ t/data/configs/apache2.4+fcgid.conf],
)
AC_OUTPUT
@@ -133,11 +29,6 @@
--- a/lib/RT/Test/Apache.pm
+++ b/lib/RT/Test/Apache.pm
@@
- '2.2' => {
- "mod_perl" => [qw(authz_host env alias perl)],
- "fastcgi" => [qw(authz_host env alias mime fastcgi)],
-+
- },
'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)],
2: 03e4a839a6 < -: ------- Set RT_TEST_APACHE_MODULES for apache+mod_fcgid tests.
3: 02809225e3 < -: ------- We cannot feasibly run the Apache+mod_fcgid tests as root.
4: eb8d160f19 < -: ------- Add combo to test PostgreSQL + Apache+mod_fcgid
-: ------- > 2: fe09462495 Add PostgreSQL tests on Travis CI.
-: ------- > 3: c501f6da64 Add three parallel test configurations:
More information about the rt-commit
mailing list