diff --git a/.github/workflows/ci-test-pr.yml b/.github/workflows/ci-test-pr.yml index 582f00f4..a5b973c2 100644 --- a/.github/workflows/ci-test-pr.yml +++ b/.github/workflows/ci-test-pr.yml @@ -87,8 +87,12 @@ jobs: env: TEST_RETRY_COUNT: 5 run: | - docker compose -f docker-test.yml exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -e DEPLOY_ENV=ci -T pender bundle exec rake "parallel:test[3]" - docker compose -f docker-test.yml exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -e DEPLOY_ENV=ci -T pender bundle exec rake parallel:spec + docker compose -f docker-test.yml exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -e DEPLOY_ENV=ci -T pender bundle exec rake routes + echo 'ran routes' + docker compose -f docker-test.yml exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -e DEPLOY_ENV=ci -T pender bundle exec rake "parallel:test" + echo 'ran parallel:test not 3' + # docker compose -f docker-test.yml exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -e DEPLOY_ENV=ci -T pender bundle exec rake parallel:spec + echo 'ran parallel:spec' - name: After PR Tests id: after-tests diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh index 75bb24d7..42093dca 100755 --- a/bin/docker-entrypoint.sh +++ b/bin/docker-entrypoint.sh @@ -27,7 +27,7 @@ if [ "${APP}" = 'pender' ] ; then port ${SERVER_PORT} EOF - if [ "${DEPLOY_ENV}" = 'local' ] ; then + if [ "${DEPLOY_ENV}" = 'local' || "${DEPLOY_ENV}" = 'test' ] ; then rm -f "${DIRPATH}/pids/server-${DEPLOY_ENV}.pid" bundle exec puma -C "${PUMA}" else # qa, live etc diff --git a/config/environments/test.rb b/config/environments/test.rb index 743c5bcb..401446ad 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -55,7 +55,7 @@ options end config.lograge.formatter = Lograge::Formatters::Json.new - config.log_level = :debug + config.log_level = :warn config.paths['log'] = "/var/log/#{ENV['DEPLOY_ENV']}.log" config.paths['tmp'] = "/tmp" config.paths['db'] = "/opt/db"