From b7e38e23a1712de8a7705f9d2fcb541f0bfd7c18 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Fri, 16 Feb 2018 13:59:00 -0500 Subject: [PATCH 01/25] Update snapshot test --- .../UtilityLine/__snapshots__/DisaggregationForm.test.js.snap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/UtilityLine/__snapshots__/DisaggregationForm.test.js.snap b/src/components/UtilityLine/__snapshots__/DisaggregationForm.test.js.snap index 4245836d..7a54e6ac 100644 --- a/src/components/UtilityLine/__snapshots__/DisaggregationForm.test.js.snap +++ b/src/components/UtilityLine/__snapshots__/DisaggregationForm.test.js.snap @@ -10,6 +10,7 @@ exports[`DisaggregationForm snapshot with form 1`] = ` Date: Mon, 19 Feb 2018 10:53:04 -0500 Subject: [PATCH 02/25] Add initial jenkinsfile --- Jenkinsfile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..ffe3987b --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,11 @@ +pipeline { + agent { dockerfile true } + + stages { + stage('Test') { + steps { + sh 'node --version' + } + } + } +} -- GitLab From f61631a6cda8d3e294a256bf471833c0d2708bd2 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 19 Feb 2018 14:27:16 -0500 Subject: [PATCH 03/25] Add test step to jenkinsfile --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ffe3987b..5cd176bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,12 @@ pipeline { - agent { dockerfile true } + agent { + dockerfile true + } stages { stage('Test') { steps { - sh 'node --version' + sh 'cd /home/docker/code && CI=true npm test' } } } -- GitLab From 7774285802b2c4b6a27e7692d83b4bb59959b54c Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 19 Feb 2018 14:52:22 -0500 Subject: [PATCH 04/25] Add jest junit output --- .gitignore | 1 + Jenkinsfile | 2 +- package-lock.json | 43 +++++++++++++++++++++++++++++++++++++++---- package.json | 4 +++- 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f7505603..0c50a601 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ node_modules # testing coverage +test-report.xml # production build diff --git a/Jenkinsfile b/Jenkinsfile index 5cd176bd..268abdac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { stages { stage('Test') { steps { - sh 'cd /home/docker/code && CI=true npm test' + sh 'cd /home/docker/code && CI=true npm run test:ci' } } } diff --git a/package-lock.json b/package-lock.json index eef4367f..721669aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "buildings", - "version": "1.14.0", + "version": "1.15.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1771,7 +1771,6 @@ "version": "4.0.0-alpha.6", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz", "integrity": "sha1-T1TdM6wN6sOyhAe8LffsYIhpycg=", - "dev": true, "requires": { "jquery": "3.2.1", "tether": "1.4.0" @@ -1830,6 +1829,15 @@ } } }, + "bpl": { + "version": "git+https://7f8bbb4b0a383ad905fee5b0f7cbc0c22533b556:x-oauth-basic@github.com/Blocp/bpl.git#044aab932460e8c5d2cc3f993538a3910d42e660", + "requires": { + "bootstrap": "4.0.0-alpha.6", + "copy-dir": "0.3.0", + "jquery": "3.2.1", + "tether": "1.4.0" + } + }, "brace-expansion": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", @@ -2569,6 +2577,14 @@ "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz", "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=" }, + "copy-dir": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/copy-dir/-/copy-dir-0.3.0.tgz", + "integrity": "sha1-3rLcL6nJKQ7UfIQVWpmabUX1o1g=", + "requires": { + "mkdir-p": "0.0.7" + } + }, "copy-to-clipboard": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz", @@ -7004,6 +7020,15 @@ "p-map": "1.2.0" } }, + "jest-junit-reporter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jest-junit-reporter/-/jest-junit-reporter-1.1.0.tgz", + "integrity": "sha1-iNYAbsE/gt9AxHiCyGQJic3LFDQ=", + "dev": true, + "requires": { + "xml": "1.0.1" + } + }, "jest-matcher-utils": { "version": "20.0.3", "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-20.0.3.tgz", @@ -7144,8 +7169,7 @@ "jquery": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz", - "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=", - "dev": true + "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=" }, "js-base64": { "version": "2.3.2", @@ -7972,6 +7996,11 @@ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, + "mkdir-p": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mkdir-p/-/mkdir-p-0.0.7.tgz", + "integrity": "sha1-JMXb4m2jqZ7xWKHu+aXC3Z3laDw=" + }, "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", @@ -13814,6 +13843,12 @@ "os-homedir": "1.0.2" } }, + "xml": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", + "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=", + "dev": true + }, "xml-char-classes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", diff --git a/package.json b/package.json index 82fe15d8..18d579a7 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "http-proxy-middleware": "0.17.2", "inquirer": "3.0.6", "jest": "20.0.3", + "jest-junit-reporter": "^1.1.0", "json-loader": "0.5.4", "node-sass": "4.6.0", "nodemon": "1.11.0", @@ -102,7 +103,8 @@ "scripts": { "start": "node scripts/start.js", "build": "node scripts/build.js", - "test": "node scripts/test.js --env=jsdom" + "test": "node scripts/test.js --env=jsdom", + "test:ci": "node scripts/test.js --env=jsdom --testResultsProcessor=jest-junit-reporter" }, "jest": { "moduleFileExtensions": [ -- GitLab From 084105b482c882fecedd784b3dc6457f12834937 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 19 Feb 2018 16:34:18 -0500 Subject: [PATCH 05/25] Add junit --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 268abdac..aabec74b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,4 +10,10 @@ pipeline { } } } + + post { + always { + junit '**/*.xml' + } + } } -- GitLab From 80777a16f8f37d27456c38040c5e8ecdc1fe1003 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 19 Feb 2018 16:59:52 -0500 Subject: [PATCH 06/25] Add copy reports to current directory --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index aabec74b..78830bb7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,6 +13,7 @@ pipeline { post { always { + sh'cp /home/docker/code/test-report.xml .' junit '**/*.xml' } } -- GitLab From 88cbfa8c9c8ea9a7a892cec692a75925ad32ca77 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 19 Feb 2018 17:14:30 -0500 Subject: [PATCH 07/25] Add jest coverage script and config --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 18d579a7..39590768 100644 --- a/package.json +++ b/package.json @@ -104,9 +104,12 @@ "start": "node scripts/start.js", "build": "node scripts/build.js", "test": "node scripts/test.js --env=jsdom", - "test:ci": "node scripts/test.js --env=jsdom --testResultsProcessor=jest-junit-reporter" + "test:ci": "node scripts/test.js --env=jsdom --testResultsProcessor=jest-junit-reporter", + "test:coverage": "node scripts/test.js --env=jsdom --coverage" }, "jest": { + "coverageReporters": ["cobertura"], + "coverageDirectory": "coverage", "moduleFileExtensions": [ "jsx", "js", -- GitLab From 8a82802ed684dd7976bfce883dfa9364e449efd7 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 19 Feb 2018 17:27:33 -0500 Subject: [PATCH 08/25] Add coverage script --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 78830bb7..43368f07 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,6 +7,7 @@ pipeline { stage('Test') { steps { sh 'cd /home/docker/code && CI=true npm run test:ci' + sh 'cd /home/docker/code && CI=true npm run test:coverage' } } } -- GitLab From 4208b94eecee0fd9719389730eb585bff7d4ba1d Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 19 Feb 2018 18:13:53 -0500 Subject: [PATCH 09/25] Rename package.js to Dashboard --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 39590768..523aea0a 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "buildings", + "name": "Dashboard", "version": "1.15.2", "private": true, "engines": { -- GitLab From a71010f8c2b47c2c5be3d007bd8ea6acd38972b0 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 19 Feb 2018 18:18:18 -0500 Subject: [PATCH 10/25] Add dockerpath and cobertura --- Jenkinsfile | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 43368f07..2288bfae 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,19 +3,36 @@ pipeline { dockerfile true } + environment { + DOCKER_PATH = '/home/docker/code' + } + + options { + buildDiscarder(logRotator(numToKeepStr: '60')) + } + stages { stage('Test') { steps { - sh 'cd /home/docker/code && CI=true npm run test:ci' - sh 'cd /home/docker/code && CI=true npm run test:coverage' + sh "cd $DOCKER_PATH && CI=true npm run test:ci" + + sh "rm -rf ./coverage" + sh "rm -rf $DOCKER_PATH/coverage" + sh "cd $DOCKER_PATH && CI=true npm run test:coverage" } } } post { always { - sh'cp /home/docker/code/test-report.xml .' + sh "cp $DOCKER_PATH/test-report.xml ." + sh "cp $DOCKER_PATH/coverage/* ./coverage" + junit '**/*.xml' + step([ + $class: 'CoberturaPublisher', + coberturaReportFile: './coverage/cobertura-coverage.xml' + ]) } } } -- GitLab From b7f10fada77a5332b63ff5df09c133236c8374f2 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 10:03:20 -0500 Subject: [PATCH 11/25] Add dockefile test --- Dockerfile.test | 10 ++++++++++ Jenkinsfile | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 Dockerfile.test diff --git a/Dockerfile.test b/Dockerfile.test new file mode 100644 index 00000000..ae2e4243 --- /dev/null +++ b/Dockerfile.test @@ -0,0 +1,10 @@ +FROM node:8 + +WORKDIR /app + +COPY ./package*.json /app/ +RUN npm install + +COPY . /app/ + +CMD [ "npm", "start" ] diff --git a/Jenkinsfile b/Jenkinsfile index 2288bfae..5affb848 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ pipeline { agent { - dockerfile true + filename 'Dockerfile.test' } environment { -- GitLab From 8a55f6888b53e3bb6f0d960d2bfcc889896f3711 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 10:04:04 -0500 Subject: [PATCH 12/25] Update dockefile agent --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5affb848..015af513 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,8 @@ pipeline { agent { - filename 'Dockerfile.test' + dockerfile { + filename 'Dockerfile.test' + } } environment { -- GitLab From 4f92788927039077f8f0f475261daa977bbbc194 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 10:47:07 -0500 Subject: [PATCH 13/25] Rename Docker_path --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 015af513..6f29fcfe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { } environment { - DOCKER_PATH = '/home/docker/code' + DOCKER_PATH = '/app' } options { -- GitLab From d05d964d29e53684bfa13d5150830ebc906af885 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 11:55:50 -0500 Subject: [PATCH 14/25] Fix copy statement on jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6f29fcfe..86a4b56b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ pipeline { post { always { sh "cp $DOCKER_PATH/test-report.xml ." - sh "cp $DOCKER_PATH/coverage/* ./coverage" + sh "cp -r $DOCKER_PATH/coverage/. ./coverage" junit '**/*.xml' step([ -- GitLab From 6c7aa5ea5c82d56498854188fa16ee6d5c83ba81 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 12:08:35 -0500 Subject: [PATCH 15/25] Add dockerfile to ignore test --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 523aea0a..aa629420 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,8 @@ "/config/polyfills.js" ], "testPathIgnorePatterns": [ - "/(build|docs|node_modules|scripts)/" + "/(build|docs|node_modules|scripts)/", + "/Dockerfile*" ], "testEnvironment": "node" }, -- GitLab From 67e45f25a61720f53826495452edc26e83d65dab Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 12:11:09 -0500 Subject: [PATCH 16/25] Copy files separately --- Dockerfile.test | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile.test b/Dockerfile.test index ae2e4243..a2f4c26b 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -2,7 +2,9 @@ FROM node:8 WORKDIR /app -COPY ./package*.json /app/ +COPY ./package-lock.json /app/ +COPY ./package.json /app/ + RUN npm install COPY . /app/ -- GitLab From 532fb20924c9c341e4b05cfdd5228b590d3b2925 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 12:11:21 -0500 Subject: [PATCH 17/25] Remove coverage before test starts --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 86a4b56b..dbb63fd4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,10 +16,10 @@ pipeline { stages { stage('Test') { steps { - sh "cd $DOCKER_PATH && CI=true npm run test:ci" - sh "rm -rf ./coverage" sh "rm -rf $DOCKER_PATH/coverage" + + sh "cd $DOCKER_PATH && CI=true npm run test:ci" sh "cd $DOCKER_PATH && CI=true npm run test:coverage" } } -- GitLab From aa99400c35c203b9081596a7aec36146445168e7 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 12:12:20 -0500 Subject: [PATCH 18/25] Ignore coverage folder when runnning test --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aa629420..993eb1bb 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "/config/polyfills.js" ], "testPathIgnorePatterns": [ - "/(build|docs|node_modules|scripts)/", + "/(build|docs|node_modules|scripts|coverage)/", "/Dockerfile*" ], "testEnvironment": "node" -- GitLab From b7f5f3ac86264ea84f6cee8ed3f2f9377a6d1dab Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 12:18:10 -0500 Subject: [PATCH 19/25] Update jenkinsfile to remove test report --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index dbb63fd4..f65cff2d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,6 +18,8 @@ pipeline { steps { sh "rm -rf ./coverage" sh "rm -rf $DOCKER_PATH/coverage" + sh "rm ./test-report.xml" + sh "rm $DOCKER_PATH/test-report.xml" sh "cd $DOCKER_PATH && CI=true npm run test:ci" sh "cd $DOCKER_PATH && CI=true npm run test:coverage" -- GitLab From c173a7894e8c7d269e1642cbd5f44dbf2b83a0e8 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 13:37:30 -0500 Subject: [PATCH 20/25] Move rm statements to after finish --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f65cff2d..2d9dc301 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,11 +16,6 @@ pipeline { stages { stage('Test') { steps { - sh "rm -rf ./coverage" - sh "rm -rf $DOCKER_PATH/coverage" - sh "rm ./test-report.xml" - sh "rm $DOCKER_PATH/test-report.xml" - sh "cd $DOCKER_PATH && CI=true npm run test:ci" sh "cd $DOCKER_PATH && CI=true npm run test:coverage" } @@ -37,6 +32,11 @@ pipeline { $class: 'CoberturaPublisher', coberturaReportFile: './coverage/cobertura-coverage.xml' ]) + + sh "rm -rf ./coverage" + sh "rm -rf $DOCKER_PATH/coverage" + sh "rm ./test-report.xml" + sh "rm $DOCKER_PATH/test-report.xml" } } } -- GitLab From c6d8d73cc44e8bf4cf9b58a50da0b8174a27ae00 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 13:50:58 -0500 Subject: [PATCH 21/25] Update file paths for jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2d9dc301..eec2a598 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,10 +27,10 @@ pipeline { sh "cp $DOCKER_PATH/test-report.xml ." sh "cp -r $DOCKER_PATH/coverage/. ./coverage" - junit '**/*.xml' + junit '**/test-report.xml' step([ $class: 'CoberturaPublisher', - coberturaReportFile: './coverage/cobertura-coverage.xml' + coberturaReportFile: '**/coverage/cobertura-coverage.xml' ]) sh "rm -rf ./coverage" -- GitLab From 4abc2417cc518c85ccbfa68acf036c43e3e6ae39 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 13:56:13 -0500 Subject: [PATCH 22/25] Comment out command in dockerfile --- Dockerfile.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.test b/Dockerfile.test index a2f4c26b..2ba3b950 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -9,4 +9,4 @@ RUN npm install COPY . /app/ -CMD [ "npm", "start" ] +# CMD [ "npm", "start" ] -- GitLab From ba3d2c977b3c1fa7f6e09a3ead7a9281a3e0c86e Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 14:02:08 -0500 Subject: [PATCH 23/25] Add ci=true to package.json --- Jenkinsfile | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index eec2a598..73d0a5e5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,8 +16,8 @@ pipeline { stages { stage('Test') { steps { - sh "cd $DOCKER_PATH && CI=true npm run test:ci" - sh "cd $DOCKER_PATH && CI=true npm run test:coverage" + sh "cd $DOCKER_PATH && npm run test:ci" + sh "cd $DOCKER_PATH && npm run test:coverage" } } } diff --git a/package.json b/package.json index 993eb1bb..e6f11f78 100644 --- a/package.json +++ b/package.json @@ -104,8 +104,8 @@ "start": "node scripts/start.js", "build": "node scripts/build.js", "test": "node scripts/test.js --env=jsdom", - "test:ci": "node scripts/test.js --env=jsdom --testResultsProcessor=jest-junit-reporter", - "test:coverage": "node scripts/test.js --env=jsdom --coverage" + "test:ci": "CI=true node scripts/test.js --env=jsdom --testResultsProcessor=jest-junit-reporter", + "test:coverage": "CI=true node scripts/test.js --env=jsdom --coverage" }, "jest": { "coverageReporters": ["cobertura"], -- GitLab From 17612400fe0e1c1d0115232d181c32952d6384b8 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 14:04:36 -0500 Subject: [PATCH 24/25] Add collectcoveragefrom option --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index e6f11f78..bf3f1673 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,9 @@ "test:coverage": "CI=true node scripts/test.js --env=jsdom --coverage" }, "jest": { + "collectCoverageFrom": [ + "src/**/*.{js,jsx}" + ], "coverageReporters": ["cobertura"], "coverageDirectory": "coverage", "moduleFileExtensions": [ -- GitLab From d715ea67864060254019e810ecffc5a797420c81 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 20 Feb 2018 18:26:35 -0500 Subject: [PATCH 25/25] Update jenkinsfile --- Dockerfile.test | 2 +- Jenkinsfile | 42 ++++++++++++++---------------------------- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/Dockerfile.test b/Dockerfile.test index 2ba3b950..0664b5eb 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -7,6 +7,6 @@ COPY ./package.json /app/ RUN npm install -COPY . /app/ +# COPY . /app/ # CMD [ "npm", "start" ] diff --git a/Jenkinsfile b/Jenkinsfile index 73d0a5e5..4fa2950c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,13 +1,5 @@ pipeline { - agent { - dockerfile { - filename 'Dockerfile.test' - } - } - - environment { - DOCKER_PATH = '/app' - } + agent any options { buildDiscarder(logRotator(numToKeepStr: '60')) @@ -16,27 +8,21 @@ pipeline { stages { stage('Test') { steps { - sh "cd $DOCKER_PATH && npm run test:ci" - sh "cd $DOCKER_PATH && npm run test:coverage" - } - } - } + script { + docker.image('dashboard-testing').inside('') { + sh 'cp -r /app/node_modules ..' - post { - always { - sh "cp $DOCKER_PATH/test-report.xml ." - sh "cp -r $DOCKER_PATH/coverage/. ./coverage" + sh 'npm run test:ci' + sh 'npm run test:coverage' - junit '**/test-report.xml' - step([ - $class: 'CoberturaPublisher', - coberturaReportFile: '**/coverage/cobertura-coverage.xml' - ]) - - sh "rm -rf ./coverage" - sh "rm -rf $DOCKER_PATH/coverage" - sh "rm ./test-report.xml" - sh "rm $DOCKER_PATH/test-report.xml" + junit '**/test-report.xml' + step([ + $class: 'CoberturaPublisher', + coberturaReportFile: '**/coverage/cobertura-coverage.xml' + ]) + } + } + } } } } -- GitLab