Merge branch '4.4/docker-testing-buster' into 4.4-trunk

4 files changed, 20 insertions, 45 deletions

diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml
index f706368ad6..af95b96f39 100644
--- a/.github/workflows/github-action.yml
+++ b/.github/workflows/github-action.yml
@@ -1,6 +1,3 @@
-#language: bash
-#services: docker
-
 on:
   push:
     branches-ignore:
@@ -19,18 +16,16 @@ jobs:
       - name: Check out RT
         uses: actions/checkout@v2
       - name: Build RT
-        env:
-          RT_TEST_PARALLEL: 1
         shell: bash
         run: |
           docker build -t rt-base .
           docker run -d -v $GITHUB_WORKSPACE:/rt --name rt rt-base
-          docker ps -a
           docker exec 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"
       - name: Run RT tests
         shell: bash
-        run: docker exec -e RT_TEST_PARALLEL=1 rt bash -c "cd /rt && prove -lj6 t/*"
+        run: docker exec rt bash -c "cd /rt && prove -rlj6 t/*"
       - name: Get run time
+        if: always()
         shell: bash
         run: |
           export RT_GA_END_TIME=$(date +%s)
@@ -66,27 +61,18 @@ jobs:
       - name: Checkout RT
         uses: actions/checkout@v2
       - name: Build RT
-        env:
-          RT_TEST_PARALLEL: 1
-          RT_DBA_USER: root
-          RT_DBA_PASSWORD: password
-          DB_VERSION_TAG: 10.3
         shell: bash
         run: |
-          docker run --name mariadb -e MYSQL_ROOT_PASSWORD=password -d mariadb:$DB_VERSION_TAG
-          docker build -t rt-base .
-          docker run -d -v $GITHUB_WORKSPACE:/rt --name rt --link mariadb:db rt-base
-          docker ps -a
+          docker network create rt
+          docker run --network rt --name mariadb -e MYSQL_ROOT_PASSWORD=password -d mariadb:10.6
+          docker build --network rt -t rt-base .
+          docker run -d -v $GITHUB_WORKSPACE:/rt --env RT_TEST_DB_HOST=mariadb --env RT_TEST_RT_HOST=172.16.0.0/255.240.0.0 --network rt --name rt rt-base
           docker exec rt bash -c "cd /rt && ./configure.ac --with-db-type=mysql --with-my-user-group --enable-layout=inplace --enable-developer --enable-externalauth --enable-gpg --enable-smime && mkdir -p /rt/var && make testdeps"
       - name: Run RT tests
-        env:
-          RT_TEST_PARALLEL: 1
-          RT_DBA_USER: root
-          RT_DBA_PASSWORD: password
-          DB_VERSION_TAG: 10.3
         shell: bash
-        run: docker exec -e RT_TEST_PARALLEL=1 -e RT_DBA_USER=root -e RT_DBA_PASSWORD=password rt bash -c "cd /rt && prove -lj6 t/*"
+        run: docker exec rt bash -c "cd /rt && prove -rlj6 t/*"
       - name: Get run time
+        if: always()
         shell: bash
         run: |
           export RT_GA_END_TIME=$(date +%s)
@@ -109,7 +95,7 @@ jobs:
           failure_text: '${env.RT_BRANCH_NAME} (${env.GITHUB_RUN_NUMBER}) tests failed in ${env.RT_GA_TEST_TIME}'
           cancelled_text: '${env.RT_BRANCH_NAME} (${env.GITHUB_RUN_NUMBER}) tests cancelled in ${env.RT_GA_TEST_TIME}'
           fields: |
-            [{ "title": "Configuration", "value": "RT Server, MariaDB 10.3", "short": true },
+            [{ "title": "Configuration", "value": "RT Server, MariaDB 10.6", "short": true },
             { "title": "URL", "value": "${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}?check_suite_focus=true", "short": true }]
   rt_test_postgresql_apache_mod_fcgid:
     runs-on: ubuntu-latest
@@ -122,32 +108,19 @@ jobs:
       - name: Checkout RT
         uses: actions/checkout@v2
       - name: Build RT
-        env:
-          DB_VERSION_TAG: 9.6
-          RT_TEST_PARALLEL: 1
-          RT_TEST_WEB_HANDLER: apache+fcgid
-          HTTPD_ROOT: /etc/apache2
-          RT_TEST_APACHE: /usr/sbin/apache2
-          RT_TEST_APACHE_MODULES: /usr/lib/apache2/modules
         shell: bash
         run: |
-          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 $GITHUB_WORKSPACE:/rt --name rt --link postgresql:db rt-base
-          docker ps -a
+          docker network create rt
+          docker run --network rt --name postgresql --mount type=tmpfs,destination=/var/lib/postgresql/data -e POSTGRES_PASSWORD=password -d postgres:12.8
+          docker build --network rt -t rt-base .
+          docker run -d -v $GITHUB_WORKSPACE:/rt --env RT_TEST_DB_HOST=postgresql --network rt --name rt rt-base
           docker exec rt bash -c "chown -R rt-user /rt; touch /etc/apache2/mime.types"
           docker exec -e USER=rt-user -u rt-user rt bash -c "cd /rt && ./configure.ac --with-db-type=Pg --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/*"
       - name: Run RT tests
-        env:
-          DB_VERSION_TAG: 9.6
-          RT_TEST_PARALLEL: 1
-          RT_TEST_WEB_HANDLER: apache+fcgid
-          HTTPD_ROOT: /etc/apache2
-          RT_TEST_APACHE: /usr/sbin/apache2
-          RT_TEST_APACHE_MODULES: /usr/lib/apache2/modules
         shell: bash
-        run: docker exec -e RT_TEST_PARALLEL=1 -e RT_DBA_USER=postgres -e RT_DBA_PASSWORD=password -u rt-user rt bash -c "cd /rt && prove -lj6 t/*"
+        run: docker exec -e RT_DBA_USER=postgres -e RT_TEST_WEB_HANDLER=apache+fcgid -e HTTPD_ROOT=/etc/apache2 -e RT_TEST_APACHE=/usr/sbin/apache2 -e RT_TEST_APACHE_MODULES=/usr/lib/apache2/modules -u rt-user rt bash -c "cd /rt && prove -rlj6 t/*"
       - name: Get run time
+        if: always()
         shell: bash
         run: |
           export RT_GA_END_TIME=$(date +%s)
@@ -170,5 +143,5 @@ jobs:
           failure_text: '${env.RT_BRANCH_NAME} (${env.GITHUB_RUN_NUMBER}) tests failed in ${env.RT_GA_TEST_TIME}'
           cancelled_text: '${env.RT_BRANCH_NAME} (${env.GITHUB_RUN_NUMBER}) tests cancelled in ${env.RT_GA_TEST_TIME}'
           fields: |
-            [{ "title": "Configuration", "value": "Apache mod_fcgid, PostgreSQL 9.6", "short": true },
+            [{ "title": "Configuration", "value": "Apache mod_fcgid, PostgreSQL 12.8", "short": true },
             { "title": "URL", "value": "${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}?check_suite_focus=true", "short": true }]
diff --git a/Dockerfile b/Dockerfile
index e14f34877b..71c366656b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # This Dockerfile is for testing only.
 
-FROM bpssysadmin/rt-base-debian-stretch
+FROM bpssysadmin/rt-base-debian:RT-5.0.3-buster-20220721
 
 ENV RT_TEST_PARALLEL 1
 ENV RT_TEST_DEVEL 1
diff --git a/t/data/configs/apache2.4+fcgid.conf.in b/t/data/configs/apache2.4+fcgid.conf.in
index f05d625ddb..702ecd2ef2 100644
--- a/t/data/configs/apache2.4+fcgid.conf.in
+++ b/t/data/configs/apache2.4+fcgid.conf.in
@@ -25,6 +25,7 @@ LogLevel debug
 
 AddDefaultCharset UTF-8
 
+FcgidMaxRequestLen 1073741824
 FcgidConnectTimeout 20
 FcgidProcessTableFile %%tmp_dir%%/shm
 FcgidIPCDir %%tmp_dir%%
diff --git a/t/web/mason-cache.t b/t/web/mason-cache.t
index 237d77e82f..1620eaef23 100644
--- a/t/web/mason-cache.t
+++ b/t/web/mason-cache.t
@@ -24,7 +24,8 @@ EOF
 
 update_mason( $hello, 'Hello world!' );
 
-$RT::MasonLocalComponentRoot = $dir;
+# Save it in site config file, so apache can see it
+RT->Config->Set( MasonLocalComponentRoot => $dir );
 
 my ( $baseurl, $m ) = RT::Test->started_ok;
 my $ticket = RT::Test->create_ticket( Queue => 'General', Subject => 'test mason cache' );