diff --git a/services/web/Jenkinsfile b/services/web/Jenkinsfile index 7b44d70315..721ede90a8 100644 --- a/services/web/Jenkinsfile +++ b/services/web/Jenkinsfile @@ -67,15 +67,38 @@ pipeline { } } - stage('Unit Test') { - agent { - docker { - image 'node:6.9.5' - reuseNode true + stage('Test and Minify') { + parallel { + stage('Unit Test') { + agent { + docker { + image 'node:6.9.5' + reuseNode true + } + } + steps { + sh 'make --no-print-directory test_unit MOCHA_ARGS="--reporter tap"' + } + } + + stage('Acceptance Test') { + steps { + // Spawns its own docker containers + sh 'make --no-print-directory test_acceptance MOCHA_ARGS="--reporter tap"' + } + } + + stage('Minify') { + agent { + docker { + image 'node:6.9.5' + reuseNode true + } + } + steps { + sh 'WEBPACK_ENV=production make minify' + } } - } - steps { - sh 'make --no-print-directory test_unit MOCHA_ARGS="--reporter tap"' } } @@ -86,25 +109,6 @@ pipeline { } } - stage('Acceptance Test') { - steps { - // Spawns its own docker containers - sh 'make --no-print-directory test_acceptance MOCHA_ARGS="--reporter tap"' - } - } - - stage('Minify') { - agent { - docker { - image 'node:6.9.5' - reuseNode true - } - } - steps { - sh 'WEBPACK_ENV=production make minify' - } - } - stage('Package') { steps { sh 'rm -rf ./node_modules/grunt*' diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index a9383714c9..1306ce91c2 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -425,7 +425,7 @@ module.exports = settings = redirects: "/templates/index": "/templates/" - reloadModuleViewsOnEachRequest: true + reloadModuleViewsOnEachRequest: process.env['NODE_ENV'] != 'production' domainLicences: [ diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml index afba1ccc60..ebf164f606 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -19,6 +19,7 @@ services: LINKED_URL_PROXY: 'http://localhost:6543' ENABLED_LINKED_FILE_TYPES: 'url,project_file,project_output_file,mendeley' SHARELATEX_CONFIG: /app/test/acceptance/config/settings.test.coffee + NODE_ENV: production depends_on: - redis - mongo