Merge pull request #59 from lykabernardo/master

Adding necessary plugins and config for pluggable scm jenkinsfile
Accenture · Jul 5, 2018 · f02c405 · f02c405
2 parents d35414c + ba57062
commit f02c405
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/resources/init.groovy.d/adop_sonar.groovy b/resources/init.groovy.d/adop_sonar.groovy
@@ -2,7 +2,6 @@ import hudson.model.*
 import jenkins.model.*
 import hudson.plugins.sonar.*
 import hudson.plugins.sonar.model.TriggersConfig
-import hudson.plugins.sonar.utils.SQServerVersions
 import hudson.tools.*
 
 // Check if enabled
@@ -14,11 +13,6 @@ if (!env['ADOP_SONAR_ENABLED'].toBoolean()) {
 
 // Variables
 def sonar_server_url = env['SONAR_SERVER_URL']
-def sonar_account_login = env['SONAR_ACCOUNT_LOGIN']
-def sonar_account_password = env['SONAR_ACCOUNT_PASSWORD']
-def sonar_db_url = env['SONAR_DB_URL']
-def sonar_db_login = env['SONAR_DB_LOGIN']
-def sonar_db_password = env['SONAR_DB_PASSWORD']
 def sonar_plugin_version = env['SONAR_PLUGIN_VERSION']
 def sonar_additional_props = env['SONAR_ADDITIONAL_PROPS']
 
@@ -38,16 +32,10 @@ Thread.start {
     def sonar_inst = new SonarInstallation(
         "ADOP Sonar", // Name
         sonar_server_url,
-        SQServerVersions.SQ_5_1_OR_LOWER, // Major version upgrade of server would require to change it
         "", // Token
-        sonar_db_url,
-        sonar_db_login,
-        sonar_db_password,
         sonar_plugin_version,
         sonar_additional_props,
         new TriggersConfig(),
-        sonar_account_login,
-        sonar_account_password,
         "" // Additional Analysis Properties
     )
 
@@ -75,7 +63,7 @@ Thread.start {
 
     def sonarRunnerInstaller = new SonarRunnerInstaller(sonar_runner_version)
     def installSourceProperty = new InstallSourceProperty([sonarRunnerInstaller])
-    def sonarRunner_inst = new SonarRunnerInstallation("ADOP SonarRunner " + sonar_runner_version, "", [installSourceProperty])
+    def sonarRunner_inst = new SonarRunnerInstallation("ADOP SonarScanner", "", [installSourceProperty])
 
     // Only add our Sonar Runner if it does not exist - do not overwrite existing config
     def sonar_runner_installations = desc_SonarRunnerInst.getInstallations()

diff --git a/resources/plugins.txt b/resources/plugins.txt
@@ -22,6 +22,7 @@ copy-to-slave:1.4.4
 copyartifact:1.39.1
 credentials-binding:1.16
 credentials:2.1.16
+cucumber:0.0.2
 cucumber-reports:3.16.0
 cvs:2.14
 dashboard-view:2.9.11
@@ -69,6 +70,7 @@ jquery:1.12.4-0
 jsch:0.1.54.2
 jslint:0.8.2
 junit:1.24
+junit-attachments:1.5
 ldap:1.20
 mailer:1.21
 mapdb-api:1.0.9.0
@@ -90,6 +92,7 @@ pipeline-build-step:2.7
 pipeline-github-lib:1.0
 pipeline-graph-analysis:1.6
 pipeline-input-step:2.8
+pipeline-maven:3.5.8
 pipeline-milestone-step:1.3.1
 pipeline-model-api:1.2.9
 pipeline-model-declarative-agent:1.1.1
@@ -110,14 +113,15 @@ scm-api:2.2.7
 script-security:1.44
 sectioned-view:1.24
 simple-theme-plugin:0.4
-sonar:2.4.4
+sonar:2.7.1
 ssh-agent:1.15
 ssh-credentials:1.13
 ssh-slaves:1.26
 structs:1.14
 subversion:2.10.5
 swarm:3.12
 tap:2.2.1
+tasks:4.52
 thinBackup:1.9
 timestamper:1.8.10
 token-macro:2.5