Merge pull request #7 from jenkinsci/single-Jenkinsfile

consolidate two Jenkinsfile for internal CI and ci.jenkins.io
jenkinsci · Mar 7, 2017 · 5793910 · 5793910
2 parents 3d52c2a + fe053d8
commit 5793910
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,14 @@
 #!/usr/bin/env groovy
+
+boolean onJenkinsCI = env.JENKINS_URL && env.JENKINS_URL.startWith('https://ci.jenkins.io')
+
+if (onJenkinsCI) {
+  /* running on ci.jenkins.io, we will have `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
+  buildPlugin()
+  return
+}
+
+
 @Library('github.com/zanata/zanata-pipeline-library@master')
 
 /* Only keep the 10 most recent builds. */

diff --git a/Jenkinsfile_jenkinsci b/Jenkinsfile_jenkinsci