From 915fdf7297ef7aeb9f9469729311b0a526c50e9c Mon Sep 17 00:00:00 2001 From: NvTimLiu <50287591+NvTimLiu@users.noreply.github.com> Date: Fri, 12 Jun 2020 03:07:32 +0800 Subject: [PATCH] Switch CICD pipelines to Github (#151) 1, Change ${gitlabBranch} to ${sha1} in Jenkinsfile.premerge, because on Github, the env VAR of Jenkins reference branch is 'sha1' 2, Remove all the 'Gitlab' related functions 3, Point the integration pipeline name (spark/plugin_integration) to the Github one(spark/rapids_integration-0.1-github). Co-authored-by: Tim Liu --- jenkins/Jenkinsfile.merge | 12 ------------ jenkins/Jenkinsfile.nightly | 4 +--- jenkins/Jenkinsfile.premerge | 15 +-------------- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/jenkins/Jenkinsfile.merge b/jenkins/Jenkinsfile.merge index 32b69e6a473..41ef7b0413f 100644 --- a/jenkins/Jenkinsfile.merge +++ b/jenkins/Jenkinsfile.merge @@ -71,16 +71,4 @@ pipeline { } } } - - post { - always { - script { - if (currentBuild.currentResult == "SUCCESS") { - updateGitlabCommitStatus(name: 'Jenkins CI', state: "success") - } else { - updateGitlabCommitStatus(name: 'Jenkins CI', state: "failed") - } - } - } - } } diff --git a/jenkins/Jenkinsfile.nightly b/jenkins/Jenkinsfile.nightly index e606acc4fba..f8f23e06f43 100644 --- a/jenkins/Jenkinsfile.nightly +++ b/jenkins/Jenkinsfile.nightly @@ -75,16 +75,14 @@ pipeline { always { script { if (currentBuild.currentResult == "SUCCESS") { - build(job: 'spark/plugin_integration', + build(job: 'spark/rapids_integration-0.1-github', propagate: false, parameters: [string(name: 'REF', value: 'branch-0.1'), string(name: 'CUDF_VER', value: '0.14-SNAPSHOT'), booleanParam(name: 'BUILD_CENTOS7', value: false),]) - updateGitlabCommitStatus(name: 'Jenkins CI', state: "success") slack("#rapidsai-spark-cicd", "Success", color: "#33CC33") } else { - updateGitlabCommitStatus(name: 'Jenkins CI', state: "failed") slack("#rapidsai-spark-cicd", "Failed", color: "#FF0000") } } diff --git a/jenkins/Jenkinsfile.premerge b/jenkins/Jenkinsfile.premerge index 1330be17f72..9bdb82574ca 100644 --- a/jenkins/Jenkinsfile.premerge +++ b/jenkins/Jenkinsfile.premerge @@ -28,11 +28,10 @@ pipeline { ansiColor('xterm') timeout(time: 120, unit: 'MINUTES') buildDiscarder(logRotator(numToKeepStr: '10')) - gitLabConnection('GitLab Master') } parameters { - string(name: 'REF', defaultValue: '\${gitlabBranch}', description: 'Commit to build') + string(name: 'REF', defaultValue: '\${sha1}', description: 'Commit to build') } environment { @@ -70,16 +69,4 @@ pipeline { } } } // end of stages - - post { - always { - script { - if (currentBuild.currentResult == "SUCCESS") { - updateGitlabCommitStatus(name: 'Jenkins CI', state: "success") - } else { - updateGitlabCommitStatus(name: 'Jenkins CI', state: "failed") - } - } - } - } } // end of pipeline