From db548d19ca9754010723a4be5bbbc31b740e7eec Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Wed, 7 Nov 2018 10:44:38 +0000 Subject: [PATCH 01/13] Updating travis file --- .gitignore | 1 + .travis.yml | 16 ++++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 95f756c..f446598 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules dist *.log coverage +.idea/ diff --git a/.travis.yml b/.travis.yml index 0bf7aa8..951075b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,7 @@ language: node_js node_js: - "11" -services: - - docker - -before_install: - - docker build -t test . && docker run test - -# language: node_js -# node_js: -# - "8" -# - "9" -# script: -# - npm test \ No newline at end of file +install: +- yarn +script: +- yarn test From 9b1b0c2fe7360f7b0cc77c300ba11387f10be121 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Wed, 7 Nov 2018 10:55:08 +0000 Subject: [PATCH 02/13] Updating travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 951075b..7279a2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,3 +9,4 @@ install: - yarn script: - yarn test + From 5f09b966287a240990af4ccb9ab72d8e499be1e6 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Fri, 9 Nov 2018 17:21:33 +0000 Subject: [PATCH 03/13] Adding Jenkins --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..5c56fe5 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,16 @@ +#!/usr/bin/env groovy + +pipeline { + agent { label 'dennis-node' } + triggers { githubPush() } + options { disableConcurrentBuilds() } + stages { + stage('Unit Test') { + steps { + sh ''' + echo "hello node" + ''' + } + } + } +} From 5d57ae085ec11b611ee662fea351695962956d33 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Sat, 10 Nov 2018 16:34:39 +0000 Subject: [PATCH 04/13] Updating Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5c56fe5..ff8525a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stage('Unit Test') { steps { sh ''' - echo "hello node" + yarn ''' } } From 2e7262bba412433f2d4dfe78d0fd37a28f6b1c2f Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Sat, 10 Nov 2018 16:38:53 +0000 Subject: [PATCH 05/13] Updating Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index ff8525a..d376992 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,3 +14,4 @@ pipeline { } } } + From afd4b7282e4c86e08c2f66c335c53e2a24a9cfd1 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Sat, 10 Nov 2018 16:40:40 +0000 Subject: [PATCH 06/13] Updating Jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d376992..ff8525a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,4 +14,3 @@ pipeline { } } } - From 7f93ac36883b3a06baa94d5c4dda142e71ceccff Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Sat, 10 Nov 2018 16:41:36 +0000 Subject: [PATCH 07/13] Updating Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index ff8525a..d376992 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,3 +14,4 @@ pipeline { } } } + From f802ccc24f3df6bbbf70ebaa845a53b024c88d68 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Sat, 10 Nov 2018 16:43:32 +0000 Subject: [PATCH 08/13] Updating Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d376992..b56142f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stage('Unit Test') { steps { sh ''' - yarn + yarn && yarn test ''' } } From 5cd670a006c9271ec44c6b4d5f634c830abf99d0 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Sat, 10 Nov 2018 16:51:16 +0000 Subject: [PATCH 09/13] Updating Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b56142f..049cf25 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stage('Unit Test') { steps { sh ''' - yarn && yarn test + yarn && yarn test ''' } } From ba8ad6a2136c170285da678d32d9c4978b6c7082 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Sun, 11 Nov 2018 15:20:54 +0000 Subject: [PATCH 10/13] Updating Jenkinsfile --- Jenkinsfile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 049cf25..471896d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,10 +8,20 @@ pipeline { stage('Unit Test') { steps { sh ''' - yarn && yarn test + yarn && yarn test ''' } } + stage('Static Code Analysis') { + when { + expression { branch "PR-*" } + } + steps { + withSonarQubeEnv('lighting-prototype') { + sh "sonar-scanner " + } + } + } } } From 43b04aadfe9253d43d3e6e533d316a3fd9fdb9b9 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Sun, 11 Nov 2018 15:25:32 +0000 Subject: [PATCH 11/13] Adding sonar-project.properties --- sonar-project.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sonar-project.properties diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..66fc0cd --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,11 @@ +sonar.projectKey=seatbookingexercise +sonar.projectName=seatbookingexercise +sonar.links.homepage=https://github.com/simon-peacock/seatbookingexercise + +sonar.sources=src +sonar.exclusions=**node_modules** +sonar.host.url=http://ec2-34-255-179-73.eu-west-1.compute.amazonaws.com:9000 +sonar.verbose=false +sonar.sourceEncoding=UTF-8 +sonar.dependencyCheck.reportPath=dependency-check-report.xml +sonar.dependencyCheck.htmlReportPath=dependency-check-report.html From 2fc49eabed20a9b5ce164510ffc95dc890552839 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Tue, 13 Nov 2018 12:54:51 +0000 Subject: [PATCH 12/13] Updating pipeline --- Jenkinsfile | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 471896d..927e3bf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,27 +1,5 @@ #!/usr/bin/env groovy -pipeline { - agent { label 'dennis-node' } - triggers { githubPush() } - options { disableConcurrentBuilds() } - stages { - stage('Unit Test') { - steps { - sh ''' - yarn && yarn test - ''' - } - } - stage('Static Code Analysis') { - when { - expression { branch "PR-*" } - } - steps { - withSonarQubeEnv('lighting-prototype') { - sh "sonar-scanner " - } - } - } - } -} +@Library('lightning-shared-libraries@master') _ +nodeUnitTest() From ca393f2b1f97763df0c6cfae35a238a043918edc Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Tue, 13 Nov 2018 13:56:44 +0000 Subject: [PATCH 13/13] Updating Jenkinsfile --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 927e3bf..1187e60 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,7 @@ #!/usr/bin/env groovy - +// Repository can be found at https://github.com/dennisinteractive/lightning-jenkins-build-scripts +// Required Library call @Library('lightning-shared-libraries@master') _ +// CAll node unit test nodeUnitTest()