Skip to content

Commit

Permalink
Switch CICD pipelines to Github (NVIDIA#151)
Browse files Browse the repository at this point in the history
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 <timl@nvidia.com>
  • Loading branch information
NvTimLiu and NvTimLiu authored Jun 11, 2020
1 parent 7294b1a commit 915fdf7
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 29 deletions.
12 changes: 0 additions & 12 deletions jenkins/Jenkinsfile.merge
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}
}
}
4 changes: 1 addition & 3 deletions jenkins/Jenkinsfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down
15 changes: 1 addition & 14 deletions jenkins/Jenkinsfile.premerge
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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

0 comments on commit 915fdf7

Please sign in to comment.