Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions netci.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import jobs.generation.ArchivalSettings;
import jobs.generation.Utilities;
import jobs.generation.InternalUtilities;

def project = GithubProject
def branch = GithubBranchName
Expand All @@ -26,7 +25,7 @@ def branch = GithubBranchName
def buildCommand = buildFile + " -$config -runtests"
def packCommand = buildFile + " -buildPackages"

def newJob = job(InternalUtilities.getFullJobName(project, jobName, isPR)) {
def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
steps {
if (os == 'Windows_NT') {
batchFile(buildCommand)
Expand All @@ -47,11 +46,14 @@ def branch = GithubBranchName
}

Utilities.setMachineAffinity(newJob, osImageName, machineAffinity)
InternalUtilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (isPR) {
Utilities.addGithubPRTriggerForBranch(newJob, branch, "$os $config")
}
else {
Utilities.addGithubPushTrigger(newJob)
}

Utilities.addMSTestResults(newJob, 'bin/**/*.trx')

Expand Down