add the ability to load local shared library

move rspec and distribution into a library folder that can be loaded as local shared lib to avoid the load code in the jenkins files. refs DE-555 flag = none [canvas-builds-refspec=d4cf97caed1edf2c9c91c48460e94f99e58a4d0a] Change-Id: Id947a389d22f04126a8654bd5e4957433cddd330 Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/261289 Tested-by: Service Cloud Jenkins <[email protected]> Reviewed-by: Aaron Ogata <[email protected]> QA-Review: Andrea Cirulli <[email protected]> Product-Review: Andrea Cirulli <[email protected]>
nehalsep7 · Mar 24, 2021 · b4a90a4 · b4a90a4
1 parent 2b51973
commit b4a90a4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -310,6 +310,7 @@ def rebaseHelper(branch, commitHistory = 100) {
 }
 
 library "canvas-builds-library@${getCanvasBuildsRefspec()}"
+loadLocalLibrary("local-lib", "build/new-jenkins/library")
 
 configuration.setUseCommitMessageFlags(env.GERRIT_EVENT_TYPE != 'change-merged')
 extendedStage.setAlwaysAllowStages([
@@ -765,7 +766,6 @@ pipeline {
                     }
                   }
 
-                  def distribution = load 'build/new-jenkins/groovy/distribution.groovy'
                   distribution.stashBuildScripts()
 
                   distribution.addRSpecSuites(stages)

diff --git a/Jenkinsfile.parallel_logs b/Jenkinsfile.parallel_logs
@@ -21,6 +21,7 @@ import org.jenkinsci.plugins.workflow.support.steps.build.DownstreamFailureCause
 import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException
 
 library "canvas-builds-library"
+loadLocalLibrary("local-lib", "build/new-jenkins/library")
 
 // if the build never starts or gets into a node block, then we
 // can never load a file. and a very noisy/confusing error is thrown.
@@ -85,7 +86,6 @@ pipeline {
       steps {
         script {
           def stages = [:]
-          def distribution = load 'build/new-jenkins/groovy/distribution.groovy'
 
           distribution.stashBuildScripts()
 
@@ -100,7 +100,6 @@ pipeline {
     stage('Copy Files') {
       steps {
         script {
-          def rspec = load 'build/new-jenkins/groovy/rspec.groovy'
           rspec.uploadParallelLog()
         }
       }

diff --git a/build/new-jenkins/groovy/distribution.groovy → ...-jenkins/library/vars/distribution.groovy b/build/new-jenkins/groovy/distribution.groovy → ...-jenkins/library/vars/distribution.groovy
@@ -68,21 +68,21 @@ def stashBuildScripts() {
  * common helper for adding rspec tests to be ran
  */
 def addRSpecSuites(stages) {
-  def rspec_node_total = load('build/new-jenkins/groovy/rspec.groovy').rspecConfig().node_total
+  def rspec_node_total = rspec.rspecConfig().node_total
   echo 'adding RSpec Test Sets'
   appendStagesAsBuildNodes(stages, rspec_node_total, 'RSpec Test Set', 'rspec') { index ->
-    load('build/new-jenkins/groovy/rspec.groovy').runRSpecSuite(rspec_node_total, index)
+    rspec.runRSpecSuite(rspec_node_total, index)
   }
 }
 
 /**
  * common helper for adding selenium tests to be ran
  */
 def addSeleniumSuites(stages) {
-  def selenium_node_total = load('build/new-jenkins/groovy/rspec.groovy').seleniumConfig().node_total
+  def selenium_node_total = rspec.seleniumConfig().node_total
   echo 'adding Selenium Test Sets'
   appendStagesAsBuildNodes(stages, selenium_node_total, 'Selenium Test Set', 'selenium') { index ->
-    load('build/new-jenkins/groovy/rspec.groovy').runSeleniumSuite(selenium_node_total, index)
+    rspec.runSeleniumSuite(selenium_node_total, index)
   }
 }
 

diff --git a/build/new-jenkins/groovy/rspec.groovy → build/new-jenkins/library/vars/rspec.groovy b/build/new-jenkins/groovy/rspec.groovy → build/new-jenkins/library/vars/rspec.groovy