test (#168)

jenkins file 적용
entrylabs · Jul 18, 2018 · 3ae4fdf · 3ae4fdf
1 parent 7308128
commit 3ae4fdf
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 35 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,43 +5,39 @@ pipeline {
     }
   }
   stages {
-    stage('SonarQube') {
+    stage('SonarQube analysis') {
       when { changeRequest() }
-      failFast true
-      parallel {
-        stage('analysis') {
-          steps {
-            script {
-              def scannerHome = tool "sonarqube-scanner";
-              withSonarQubeEnv("sonar") {
-                sh "${scannerHome}/bin/sonar-scanner " +
-                "-Dsonar.projectKey=entry.entryHW " +
-                "-Dsonar.projectName=EntryHW " +
-                "-Dsonar.sourceEncoding=UTF-8 " +
-                "-Dsonar.analysis.mode=preview " +
-                "-Dsonar.github.repository=entrylabs/entry-hw " +
-                "-Dsonar.github.endpoint=https://api.github.com " +
-                "-Dsonar.github.oauth=${GH_TOKEN} " +
-                "-Dsonar.issuesReport.console.enable=true " +
-                "-Dsonar.github.disableInlineComments=true " +
-                "-Dsonar.github.pullRequest=${env.CHANGE_ID} " +
-                "-Dsonar.sources=app "
-              }
-            }
+      steps {
+        script {
+          def scannerHome = tool "sonarqube-scanner";
+          withSonarQubeEnv("sonar") {
+            sh "${scannerHome}/bin/sonar-scanner " +
+            "-Dsonar.projectKey=entry.entryHW " +
+            "-Dsonar.projectName=EntryHW " +
+            "-Dsonar.sourceEncoding=UTF-8 " +
+            "-Dsonar.analysis.mode=preview " +
+            "-Dsonar.github.repository=entrylabs/entry-hw " +
+            "-Dsonar.github.endpoint=https://api.github.com " +
+            "-Dsonar.github.oauth=${GH_TOKEN} " +
+            "-Dsonar.issuesReport.console.enable=true " +
+            "-Dsonar.github.disableInlineComments=true " +
+            "-Dsonar.github.pullRequest=${env.CHANGE_ID} " +
+            "-Dsonar.sources=app "
           }
         }
-        stage('scan') {
-          steps {
-            script {
-              def scannerHome = tool "sonarqube-scanner";
-              withSonarQubeEnv("sonar") {
-                sh "${scannerHome}/bin/sonar-scanner " +
-                "-Dsonar.projectKey=entry.entryHW " +
-                "-Dsonar.projectName=EntryHW " +
-                "-Dsonar.sourceEncoding=UTF-8 " +
-                "-Dsonar.sources=app "
-              }
-            }
+      }
+    }
+    stage('SonarQube scan') {
+      when { changeRequest() }
+      steps {
+        script {
+          def scannerHome = tool "sonarqube-scanner";
+          withSonarQubeEnv("sonar") {
+            sh "${scannerHome}/bin/sonar-scanner " +
+            "-Dsonar.projectKey=entry.entryHW " +
+            "-Dsonar.projectName=EntryHW " +
+            "-Dsonar.sourceEncoding=UTF-8 " +
+            "-Dsonar.sources=app "
           }
         }
       }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "entry_hw",
     "version": "1.6.25",
-    "description": "엔트리 하드웨어 연결 프로그램",
+    "description": "엔트리 하드웨어 연결 프로그램1",
     "author": "EntryLabs",
     "main": "app/index.js",
     "scripts": {