[hop] branch 2.0.0 updated: fix branch name in sonar analysis

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch 2.0.0
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/2.0.0 by this push:
     new a978ca1  fix branch name in sonar analysis
     new 6e50419  Merge pull request #1261 from hansva/2.0.0
a978ca1 is described below

commit a978ca19e3de7109c82e3092174a3b475d31d6b2
Author: Hans Van Akelyen <hans.van.akel...@gmail.com>
AuthorDate: Thu Jan 6 13:19:58 2022 +0100

    fix branch name in sonar analysis
---
 Jenkinsfile       | 2 +-
 Jenkinsfile.daily | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0fbe70e..63f1eea 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
 def JDK_NAME = env.JDK_NAME ?: 'jdk_11_latest'
 def MAVEN_NAME = env.MAVEN_NAME ?: 'maven_3_latest'
 
-def MAVEN_PARAMS = "-T 2 -U -B -e -fn -V -Dmaven.compiler.fork=true 
-Dsurefire.rerunFailingTestsCount=2"
+def MAVEN_PARAMS = "-T 2 -U -B -e -fae -V -Dmaven.compiler.fork=true 
-Dsurefire.rerunFailingTestsCount=2"
 //removed fae (fail at end) by fn (fail never) to have an overview of the 
errors during development
 
 pipeline {
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 1211645..b13e5ae 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -58,7 +58,7 @@ pipeline {
     stages {
         stage('Initialization') {
               steps {
-                  echo 'Building Branch: ' + env.BRANCH_NAME
+                  echo 'Building Branch: 2.0.0'
                   echo 'Using PATH = ' + env.PATH
                   echo 'Using Jenkins user = ' + jenkins_user
                   echo 'Using Jenkins userid = ' + jenkins_uid
@@ -74,7 +74,7 @@ pipeline {
          }
         stage('Checkout') {
             steps {
-                echo 'Checking out branch ' + env.BRANCH_NAME
+                echo 'Checking out branch 2.0.0'
                 checkout scm
             }
         }
@@ -91,7 +91,7 @@ pipeline {
             steps {
                 echo 'Checking Code Quality on SonarCloud'
                 withCredentials([string(credentialsId: 
'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
-                    sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io 
-Dsonar.organization=apache -Dsonar.projectKey=apache_hop 
-Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
+                    sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io 
-Dsonar.organization=apache -Dsonar.projectKey=apache_hop 
-Dsonar.branch.name=2.0.0 -Dsonar.login=${SONAR_TOKEN}'
                 }
             }
         }