From f30df316a45076a0c755888a09de886bab51ab62 Mon Sep 17 00:00:00 2001 From: Artem <44843067+artnbondarenko@users.noreply.github.com> Date: Thu, 27 Jun 2019 17:40:04 -0500 Subject: [PATCH 001/101] Update Jenkinsfile --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index cf6ea71f5a..45f29844de 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'node:6-alpine' - args '-p 3000:3000' + args '-u root -p 3000:3000' } } environment { From 9ac316703bc3d599d7f8650c2819c16c7d639bf5 Mon Sep 17 00:00:00 2001 From: nickgulrajani Date: Thu, 4 Jul 2019 09:30:51 -0400 Subject: [PATCH 002/101] jenkins --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 45f29844de..8bd07c8ba5 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'node:6-alpine' - args '-u root -p 3000:3000' + args '-u jenkins -p 3000:3000' } } environment { From d87584d3c94d61cc8f2097cf275e0951e56eb567 Mon Sep 17 00:00:00 2001 From: nickgulrajani Date: Thu, 4 Jul 2019 09:46:55 -0400 Subject: [PATCH 003/101] root user --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 8bd07c8ba5..45f29844de 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'node:6-alpine' - args '-u jenkins -p 3000:3000' + args '-u root -p 3000:3000' } } environment { From d568a194c2b8465378931b02be4b4611fba0a881 Mon Sep 17 00:00:00 2001 From: nickgulrajani Date: Mon, 12 Aug 2019 19:16:13 -0400 Subject: [PATCH 004/101] port change --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 45f29844de..ff79c0ec1d 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'node:6-alpine' - args '-u root -p 3000:3000' + args '-u root -p 8083:8083' } } environment { From 61f6f1865109902ead1d795c23b99083d2a6ebca Mon Sep 17 00:00:00 2001 From: nickgulrajani Date: Thu, 22 Aug 2019 11:06:38 -0400 Subject: [PATCH 005/101] SQ Changes --- jenkins/Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index ff79c0ec1d..7924b0bfbc 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -14,6 +14,21 @@ pipeline { sh 'npm install' } } + + stage('Sonarqube') { + environment { + scannerHome = tool 'sonar' + } + steps { + withSonarQubeEnv('sonarqube') { + sh "${scannerHome}/bin/sonar-scanner" + } + timeout(time: 10, unit: 'MINUTES') { + waitForQualityGate abortPipeline: true + } + } + } + stage('Test') { steps { sh './jenkins/scripts/test.sh' From 053e6a357cf81a1f9fcdcd560d1af4e4ffe7720d Mon Sep 17 00:00:00 2001 From: nickgulrajani Date: Thu, 22 Aug 2019 11:08:56 -0400 Subject: [PATCH 006/101] Update Jenkinsfile --- jenkins/Jenkinsfile | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 7924b0bfbc..2d2ce4839c 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -14,20 +14,7 @@ pipeline { sh 'npm install' } } - - stage('Sonarqube') { - environment { - scannerHome = tool 'sonar' - } - steps { - withSonarQubeEnv('sonarqube') { - sh "${scannerHome}/bin/sonar-scanner" - } - timeout(time: 10, unit: 'MINUTES') { - waitForQualityGate abortPipeline: true - } - } - } + stage('Test') { steps { From d4753b2d4911d4c4727834994dd3ee362acad027 Mon Sep 17 00:00:00 2001 From: nickgulrajani Date: Thu, 22 Aug 2019 11:24:46 -0400 Subject: [PATCH 007/101] sq update --- jenkins/Jenkinsfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 2d2ce4839c..825528be2d 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -21,6 +21,23 @@ pipeline { sh './jenkins/scripts/test.sh' } } + + stage('Sonarqube') { + environment { + scannerHome = tool 'SonarQubeScanner' + } + steps { + withSonarQubeEnv('sonarqube') { + sh "${scannerHome}/bin/sonar-scanner" + } + timeout(time: 10, unit: 'MINUTES') { + waitForQualityGate abortPipeline: true + } + } +} + + + stage('Deliver') { steps { sh './jenkins/scripts/deliver.sh' From 6e0683d185e3618d90899f0f4f22293dfaae70e2 Mon Sep 17 00:00:00 2001 From: nickgulrajani Date: Thu, 22 Aug 2019 11:26:39 -0400 Subject: [PATCH 008/101] sq update --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 825528be2d..c21a55c491 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { stage('Sonarqube') { environment { - scannerHome = tool 'SonarQubeScanner' + scannerHome = tool 'sonar"' } steps { withSonarQubeEnv('sonarqube') { From 503229cc29725b2567808a91d92567d08b7a7647 Mon Sep 17 00:00:00 2001 From: nickgulrajani Date: Thu, 22 Aug 2019 11:28:37 -0400 Subject: [PATCH 009/101] typo --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index c21a55c491..1431ba7bea 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { stage('Sonarqube') { environment { - scannerHome = tool 'sonar"' + scannerHome = tool 'sonar' } steps { withSonarQubeEnv('sonarqube') { From c7a766ca4376dc47de9f6262922e2dd15a26dbc6 Mon Sep 17 00:00:00 2001 From: nickgulrajani Date: Thu, 22 Aug 2019 11:50:52 -0400 Subject: [PATCH 010/101] sq removed --- jenkins/Jenkinsfile | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 1431ba7bea..d4bda647bc 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -22,20 +22,7 @@ pipeline { } } - stage('Sonarqube') { - environment { - scannerHome = tool 'sonar' - } - steps { - withSonarQubeEnv('sonarqube') { - sh "${scannerHome}/bin/sonar-scanner" - } - timeout(time: 10, unit: 'MINUTES') { - waitForQualityGate abortPipeline: true - } - } -} - + stage('Deliver') { From 3aea15a9236b1e1c38e96cbc203cb403d36dbb67 Mon Sep 17 00:00:00 2001 From: nickgulrajani Date: Tue, 27 Aug 2019 10:35:30 -0400 Subject: [PATCH 011/101] tag change --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 7bee027101..e9fc1da4ea 100644 --- a/public/index.html +++ b/public/index.html @@ -19,7 +19,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - React App + React App by Nick