Merge pull request #3504 from NervanaSystems/aslepko/ci

Modifying CI interface

.ci/jenkins/jenkins-trigger.groovy

@@ -21,32 +21,24 @@
 // set these up below as global variables, so we do not need to rewrite the
 // original script -- we only need to provide this new trigger hook.
 //
-// Parameters which ngraph-unittest uses:
-String  PR_URL = CHANGE_URL
-String  PR_COMMIT_AUTHOR = CHANGE_AUTHOR
-String  PR_TARGET = CHANGE_TARGET
-String  JENKINS_BRANCH = "master"
-Integer TIMEOUTTIME = "3600"
-// BRANCH parameter is no loner needed
-// TRIGGER_URL parameter is no longer needed
+
+String JENKINS_BRANCH = "master"
+String TIMEOUTTIME = "3600"
 
 // Constants
 JENKINS_DIR = '.'
 
-env.MB_PIPELINE_CHECKOUT = true
-
 timestamps {
+
     node("trigger") {
 
         deleteDir()  // Clear the workspace before starting
 
         // Clone the cje-algo directory which contains our Jenkins groovy scripts
-        try {
+        def sleeptime=0
+        retry(count: 3) {
+            sleep sleeptime; sleeptime = 10
             sh "git clone -b $JENKINS_BRANCH https://github.intel.com/AIPG/cje-algo ."
-        } catch (e) {
-            echo "${e}"
-            println("ERROR: An error occurred during cje-algo script checkout.")
-            throw e
         }
 
         // Call the main job script.
@@ -57,10 +49,22 @@ timestamps {
         
         echo "Calling ngraph-ci-premerge.groovy"
         def ngraphCIPreMerge = load("${JENKINS_DIR}/ngraph-ci-premerge.groovy")
-        ngraphCIPreMerge(PR_URL, PR_COMMIT_AUTHOR, JENKINS_BRANCH, TIMEOUTTIME, PR_TARGET)
+
+        ngraphCIPreMerge(premerge: 'true',
+                         prURL: CHANGE_URL,
+                         prTitle: CHANGE_TITLE,
+                         prTarget: CHANGE_TARGET,
+                         prAuthor: CHANGE_AUTHOR,
+                         jenkinsBranch: JENKINS_BRANCH,
+                         timeoutTime: TIMEOUTTIME,
+                         useMBPipelineSCM: 'true',
+                         checkoutBranch: '-UNDEFINED-BRANCH-'
+                        )
+                         
         echo "ngraph-ci-premerge.groovy completed"
 
     }  // End:  node
+
 }  // End:  timestamps
 
 echo "Done"