Fix CI build.

diff --git a/README.md b/README.md
index c6ecd3196aa6f3b9cef6c815d8a9b778620f50f6..a7b0679e3839e881c1778db9ef1f7ab1bd940e66 100644 (file)
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ This repository contains the source code for various .NET Core runtime diagnosti
 
 Another goal to make it easier to obtain a version of lldb (currently 3.9) with scripts and documentation for platforms/distros like Centos, Alpine, Fedora, etc. that by default provide really old versions. 
 
-This repo will also allow out of band development of new SOS and lldb plugin features like symbol server support and solve the source build problem having SOS.NETCore (managed portion of SOS) in the coreclr repo.
+This repo will also allow out of band development of new SOS and lldb plugin features like symbol server support for the .NET Core runtime and solve the source build problem having SOS.NETCore (managed portion of SOS) in the coreclr repo.
 
 ## Useful Links
 

diff --git a/netci.groovy b/netci.groovy
index 1e2c5f4f16ae05175d095b96b72a5380c1acb034..efc74e2d285e048308f2dbe553375fc0437ae838 100644 (file)
--- a/netci.groovy
+++ b/netci.groovy
@@ -1,6 +1,3 @@
-// Groovy Script: http://www.groovy-lang.org/syntax.html
-// Jenkins DSL: https://github.com/jenkinsci/job-dsl-plugin/wiki
-
 // Import the pipeline declaration classes.
 import org.dotnet.ci.pipelines.Pipeline
 
@@ -10,47 +7,40 @@ def project = GithubProject
 // The input branch name (e.g. master)
 def branch = GithubBranchName
 
-class Constants {
-
-    def static osList = [
-        'Windows_NT',
-//        'Ubuntu',
-        'Ubuntu16.04',
-//        'Ubuntu16.10',
-//        'Debian8.4',
-        'CentOS7.1',
-//        'RHEL7.2',
-//        'Fedora24'
-    ]
-
-    def static configurationList = [
-//        'Debug', 
-        'Release'
-    ]
-
-    // This is the set of architectures
-    def static architectureList = [
-//        'arm', 
-//        'arm64', 
-        'x64', 
-//        'x86'
-    ]
-
-}
+// Possible OS's
+//
+// 'Windows_NT'
+// 'Ubuntu'
+// 'Ubuntu16.04'
+// 'Ubuntu16.10'
+// 'Debian8.4'
+// 'RHEL7.2'
+// 'Fedora24'
+// 'CentOS7.1'
+// 'OSX10.12'
+
+// Possible Architechures
+//
+// 'arm', 
+// 'arm64'
+// 'x86'
+// 'x64'
+
+def configurations = [
+    ['OS':'Windows_NT', 'Architechure':'x64', 'Configuration':'Release'],
+    ['OS':'Ubuntu16.04', 'Architechure':'x64', 'Configuration':'Release'],
+    ['OS':'CentOS7.1', 'Architechure':'x64', 'Configuration':'Release'],
+]
 
 // Create build and test pipeline job
-def pipeline = Pipeline.createPipeline(this, project, branch, 'pipeline.groovy')
+def pipeline = Pipeline.createPipelineForGithub(this, project, branch, 'pipeline.groovy')
 
-Constants.osList.each { os ->
-    Constants.architectureList.each { architechure ->
-        Constants.configurationList.each { configuration ->
-            def triggerName = "${os} ${architechure} ${configuration} Build and Test"
-            def params = ['OS':os, 'Architechure':architechure, 'Configuration':configuration]
+configurations.each { configParams ->
+    def triggerName = "${configParams.OS} ${configParams.Architechure} ${configParams.Configuration} Build and Test"
 
-            pipeline.triggerPipelineOnEveryPR(triggerName, params)
+    // Add PR trigger
+    pipeline.triggerPipelineOnEveryGithubPR(triggerName, configParams)
 
-            // Add trigger to run on merge
-            pipeline.triggerPipelineOnPush(params)
-        }
-    }
+    // Add trigger to run on merge
+    pipeline.triggerPipelineOnGithubPush(configParams)
 }