You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2020/12/27 15:08:13 UTC

[incubator-hop] branch HOP-2318 updated: HOP-2318: switch to sh steps for Jenkins

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

hansva pushed a commit to branch HOP-2318
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git


The following commit(s) were added to refs/heads/HOP-2318 by this push:
     new 112079f  HOP-2318: switch to sh steps for Jenkins
112079f is described below

commit 112079f4688fda7e41c2da9dbc39ac06545bb472
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 27 16:08:02 2020 +0100

    HOP-2318: switch to sh steps for Jenkins
---
 Jenkinsfile.daily | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 2fd573a..b2a9997 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -55,10 +55,6 @@ pipeline {
         disableConcurrentBuilds()
     }
 
-    parameters {
-        booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform the build in clean workspace')
-    }
-
     stages {
         stage('Initialization') {
               steps {
@@ -88,32 +84,28 @@ pipeline {
                 sh "mvn $MAVEN_PARAMS clean install"
             }
         }
-        stage('Code Quality') {
-            tools{
-                jdk 'jdk_11_latest'
-            }
-            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_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
-                }
-            }
-        }
+        // stage('Code Quality') {
+        //     tools{
+        //         jdk 'jdk_11_latest'
+        //     }
+        //     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_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
+        //         }
+        //     }
+        // }
         stage('Create Docker image & Run Tests'){
             steps {
-                script {
-                        docker-compose -f docker/integration-tests/docker-compose-ci.yaml up -d
-                        docker wait integration-tests_integration_test_1
-                        docker logs integration-tests_integration_test_1
-                    }
+                    sh docker-compose -f 'docker/integration-tests/docker-compose-ci.yaml' up -d
+                    sh docker wait integration-tests_integration_test_1
+                    sh docker logs integration-tests_integration_test_1
                 }
             }
             post {
                 always {
                     junit(testResults: 'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true)
-                    script{
-                        docker-compose -f docker/integration-tests/docker-compose-ci.yaml down --rmi all
-                    }
+                    sh docker-compose -f 'docker/integration-tests/docker-compose-ci.yaml' down --rmi all
                 }
             }
         }