summaryrefslogtreecommitdiff
path: root/buildpipeline
diff options
context:
space:
mode:
authorMatt Mitchell <mmitche@microsoft.com>2018-03-20 16:40:37 (GMT)
committerGitHub <noreply@github.com>2018-03-20 16:40:37 (GMT)
commit16f287e132edc42384032bc0f1005f523a7eac06 (patch)
tree8aa9efb5490c157cc05aa2ce6ff773e80d598c30 /buildpipeline
parentf75a37ec729977e611b761d43c697eb60edf66e3 (diff)
downloadcoreclr-16f287e132edc42384032bc0f1005f523a7eac06.zip
coreclr-16f287e132edc42384032bc0f1005f523a7eac06.tar.gz
coreclr-16f287e132edc42384032bc0f1005f523a7eac06.tar.bz2
Merge test job updates from master (#17066)
* Remove obselete buildtests job * Update queues
Diffstat (limited to 'buildpipeline')
-rw-r--r--buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json515
-rw-r--r--buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json2
2 files changed, 1 insertions, 516 deletions
diff --git a/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json b/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
deleted file mode 100644
index 287205e..0000000
--- a/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
+++ /dev/null
@@ -1,515 +0,0 @@
-{
- "build": [
- {
- "environment": {},
- "enabled": true,
- "continueOnError": true,
- "alwaysRun": false,
- "displayName": "Run AgentTools/Begin.ps1",
- "timeoutInMinutes": 0,
- "condition": "succeededOrFailed()",
- "task": {
- "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
- "versionSpec": "2.*",
- "definitionType": "task"
- },
- "inputs": {
- "targetType": "inline",
- "filePath": "",
- "arguments": "",
- "script": "if (Test-Path \"$(AgentToolsPath)\\Begin.ps1\") {\n \"Begin.ps1 script found. Executing...\"\n & $(AgentToolsPath)\\Begin.ps1\n} else {\n \"Begin.ps1 script does not exist. Moving on...\"\n}",
- "errorActionPreference": "continue",
- "failOnStderr": "false",
- "ignoreLASTEXITCODE": "true",
- "workingDirectory": ""
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": false,
- "alwaysRun": false,
- "displayName": "Setup vs dev env",
- "timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
- "refName": "Task1",
- "task": {
- "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "filename": "setup_vs_tools.cmd",
- "arguments": "",
- "modifyEnvironment": "true",
- "workingFolder": "",
- "failOnStandardError": "false"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": false,
- "alwaysRun": false,
- "displayName": "Run clean.cmd",
- "timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
- "refName": "Task2",
- "task": {
- "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "filename": "clean.cmd",
- "arguments": "-all",
- "workingFolder": "",
- "failOnStandardError": "false"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": false,
- "alwaysRun": false,
- "displayName": "Run sync.cmd",
- "timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
- "refName": "Task3",
- "task": {
- "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "filename": "sync.cmd",
- "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -RuntimeId=$(Rid) -BlobNamePrefix=$(PB_BlobNamePrefix)$(PB_BuildType)/TestNativeBins/$(Rid) -- /p:DownloadDirectory=$(Build.SourcesDirectory)/packages/TestNativeBins/$(Rid)/$(PB_BuildType)",
- "workingFolder": "",
- "failOnStandardError": "false"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": false,
- "alwaysRun": false,
- "displayName": "Generate version props file",
- "timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
- "refName": "Task4",
- "task": {
- "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "filename": "msbuild",
- "arguments": "createVersionFile.proj /p:OfficialBuildId=$(OfficialBuildId)",
- "workingFolder": "src",
- "failOnStandardError": "false"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": true,
- "alwaysRun": true,
- "displayName": "Install Microsoft.DotNet.Build.Tasks.ScepOps",
- "timeoutInMinutes": 0,
- "condition": "always()",
- "task": {
- "id": "333b11bd-d341-40d9-afcf-b32d5ce6f23b",
- "versionSpec": "2.*",
- "definitionType": "task"
- },
- "inputs": {
- "command": "custom",
- "solution": "**/*.sln",
- "selectOrConfig": "select",
- "feedRestore": "",
- "includeNuGetOrg": "true",
- "nugetConfigPath": "",
- "externalEndpoints": "",
- "noCache": "false",
- "packagesDirectory": "",
- "verbosityRestore": "Detailed",
- "searchPatternPush": "$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg",
- "nuGetFeedType": "internal",
- "feedPublish": "",
- "allowPackageConflicts": "false",
- "externalEndpoint": "",
- "verbosityPush": "Detailed",
- "searchPatternPack": "**/*.csproj",
- "configurationToPack": "$(BuildConfiguration)",
- "outputDir": "$(Build.ArtifactStagingDirectory)",
- "versioningScheme": "off",
- "includeReferencedProjects": "false",
- "versionEnvVar": "",
- "requestedMajorVersion": "1",
- "requestedMinorVersion": "0",
- "requestedPatchVersion": "0",
- "packTimezone": "utc",
- "includeSymbols": "false",
- "toolPackage": "false",
- "buildProperties": "",
- "verbosityPack": "Detailed",
- "arguments": "install Microsoft.DotNet.Build.Tasks.ScepOps -source https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json -OutputDirectory $(Build.StagingDirectory)"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": true,
- "alwaysRun": false,
- "displayName": "Uninstall SCEP",
- "timeoutInMinutes": 0,
- "refName": "Task52",
- "task": {
- "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "solution": "$(Build.StagingDirectory)\\Microsoft.DotNet.Build.Tasks.ScepOps.1.0.1\\build\\Microsoft.DotNet.Build.Tasks.ScepOps.targets",
- "msbuildLocationMethod": "version",
- "msbuildVersion": "14.0",
- "msbuildArchitecture": "x64",
- "msbuildLocation": "",
- "platform": "",
- "configuration": "",
- "msbuildArguments": "/t:UninstallSCEP",
- "clean": "false",
- "maximumCpuCount": "false",
- "restoreNugetPackages": "false",
- "logProjectEvents": "false",
- "createLogFile": "false"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": false,
- "alwaysRun": false,
- "displayName": "Run build-test.cmd",
- "timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
- "refName": "Task5",
- "task": {
- "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "filename": "build-test.cmd",
- "arguments": "$(PB_BuildType) $(Architecture) buildagainstpackages runtimeid $(Rid) $(TargetsNonWindowsArg)$(CrossgenArg)-OfficialBuildId=$(OfficialBuildId) -OverwriteCoreClrPackageVersion -Priority=$(Priority) -- /p:IntermediateAzureFeed=$(IntermediateAzureFeed)",
- "workingFolder": "",
- "failOnStandardError": "false"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": true,
- "alwaysRun": true,
- "displayName": "Install SCEP",
- "timeoutInMinutes": 0,
- "refName": "Task53",
- "task": {
- "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "solution": "$(Build.StagingDirectory)\\Microsoft.DotNet.Build.Tasks.ScepOps.1.0.1\\build\\Microsoft.DotNet.Build.Tasks.ScepOps.targets",
- "msbuildLocationMethod": "version",
- "msbuildVersion": "14.0",
- "msbuildArchitecture": "x64",
- "msbuildLocation": "",
- "platform": "",
- "configuration": "",
- "msbuildArguments": "/t:InstallSCEP",
- "clean": "false",
- "maximumCpuCount": "false",
- "restoreNugetPackages": "false",
- "logProjectEvents": "false",
- "createLogFile": "false"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": false,
- "alwaysRun": false,
- "displayName": "Send job to Helix",
- "timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
- "refName": "Task6",
- "task": {
- "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "filename": "msbuild",
- "arguments": "helixpublish.proj /p:CloudDropAccessToken=$(CloudDropAccessToken) /p:CloudDropAccountName=$(CloudDropAccountName) /p:ContainerName=$(PB_ContainerName) /p:Platform=$(Architecture) /p:BuildType=$(PB_BuildType) /p:CloudResultsAccountName=$(CloudResultsAccountName) /p:CloudResultsAccessToken=$(CloudResultsAccessToken) /p:TargetsWindows=$(TargetsWindows) /p:OverwriteOnUpload=true /p:Rid=$(Rid) /p:TargetQueues=\"$(TargetQueues)\" /p:TestProduct=$(TestProduct) /p:Branch=$(SourceBranch) /p:HelixApiAccessKey=$(HelixApiAccessKey) /p:HelixApiEndpoint=$(HelixApiEndpoint) /p:FilterToOSGroup=$(FilterToOSGroup) /p:FilterToTestTFM=$(FilterToTestTFM) /p:TimeoutInSeconds=1800 /p:HelixJobType=$(HelixJobType) /fileloggerparameters:Verbosity=diag;LogFile=helix.log",
- "workingFolder": "tests",
- "failOnStandardError": "false"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": true,
- "alwaysRun": true,
- "displayName": "Copy Files to: $(Build.StagingDirectory)\\BuildLogs",
- "timeoutInMinutes": 0,
- "condition": "succeededOrFailed()",
- "refName": "CopyFiles1",
- "task": {
- "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c",
- "versionSpec": "2.*",
- "definitionType": "task"
- },
- "inputs": {
- "SourceFolder": "",
- "Contents": "**/*.log",
- "TargetFolder": "$(Build.StagingDirectory)\\BuildLogs",
- "CleanTargetFolder": "false",
- "OverWrite": "false",
- "flattenFolders": "false"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": true,
- "alwaysRun": true,
- "displayName": "Publish Artifact: BuildLogs",
- "timeoutInMinutes": 0,
- "condition": "succeededOrFailed()",
- "refName": "PublishBuildArtifacts1",
- "task": {
- "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe",
- "versionSpec": "1.*",
- "definitionType": "task"
- },
- "inputs": {
- "PathtoPublish": "$(Build.StagingDirectory)\\BuildLogs",
- "ArtifactName": "BuildLogs",
- "ArtifactType": "Container",
- "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)",
- "Parallel": "false",
- "ParallelCount": "8"
- }
- }
- ],
- "options": [
- {
- "enabled": false,
- "definition": {
- "id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
- },
- "inputs": {
- "workItemType": "234347",
- "assignToRequestor": "true",
- "additionalFields": "{}"
- }
- },
- {
- "enabled": false,
- "definition": {
- "id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
- },
- "inputs": {
- "additionalFields": "{}"
- }
- },
- {
- "enabled": false,
- "definition": {
- "id": "5d58cc01-7c75-450c-be18-a388ddb129ec"
- },
- "inputs": {
- "branchFilters": "[\"+refs/heads/*\"]",
- "additionalFields": "{}"
- }
- },
- {
- "environment": {},
- "enabled": true,
- "continueOnError": true,
- "alwaysRun": true,
- "displayName": "Run AgentTools/End.ps1",
- "timeoutInMinutes": 0,
- "condition": "succeededOrFailed()",
- "task": {
- "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
- "versionSpec": "2.*",
- "definitionType": "task"
- },
- "inputs": {
- "targetType": "inline",
- "filePath": "",
- "arguments": "",
- "script": "if (Test-Path \"$(AgentToolsPath)\\End.ps1\") {\n \"End.ps1 script found. Executing...\"\n & $(AgentToolsPath)\\End.ps1\n} else {\n \"End.ps1 script does not exist. Moving on...\"\n}",
- "errorActionPreference": "continue",
- "failOnStderr": "false",
- "ignoreLASTEXITCODE": "true",
- "workingDirectory": ""
- }
- }
- ],
- "variables": {
- "system.debug": {
- "value": "false",
- "allowOverride": true
- },
- "PB_BuildType": {
- "value": "Release",
- "allowOverride": true
- },
- "Architecture": {
- "value": "x64",
- "allowOverride": true
- },
- "Priority": {
- "value": "1"
- },
- "CloudDropAccountName": {
- "value": "dotnetbuildoutput"
- },
- "CloudDropAccessToken": {
- "value": null,
- "isSecret": true
- },
- "OfficialBuildId": {
- "value": "$(Build.BuildNumber)",
- "allowOverride": true
- },
- "Label": {
- "value": "$(Build.BuildNumber)",
- "allowOverride": true
- },
- "PB_SkipTests": {
- "value": "false",
- "allowOverride": true
- },
- "CloudResultsAccountName": {
- "value": "dotnetjobresults"
- },
- "CloudResultsAccessToken": {
- "value": null,
- "isSecret": true
- },
- "TargetsWindows": {
- "value": "false"
- },
- "Rid": {
- "value": "linux-x64"
- },
- "TargetQueues": {
- "value": "debian.82.amd64,fedora.26.amd64,fedora.27.amd64,redhat.73.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1710.amd64,ubuntu.1804.amd64,opensuse.423.amd64,sles.12.amd64"
- },
- "TestProduct": {
- "value": "coreclr"
- },
- "SourceBranch": {
- "value": "master"
- },
- "HelixApiAccessKey": {
- "value": null,
- "isSecret": true
- },
- "HelixApiEndpoint": {
- "value": "https://helix.dot.net/api/2016-09-12/jobs"
- },
- "FilterToOSGroup": {
- "value": "Dummy"
- },
- "FilterToTestTFM": {
- "value": "Dummy"
- },
- "PB_ContainerName": {
- "value": "$(Label)-$(TestContainerSuffix)-test"
- },
- "TestContainerSuffix": {
- "value": "linux"
- },
- "IntermediateAzureFeed": {
- "value": "https://dotnetbuildoutput.blob.core.windows.net/$(PB_ContainerName)/$(PB_BlobNamePrefix)$(PB_BuildType)/pkg/index.json"
- },
- "RuntimeIDArg": {
- "value": "runtimeid linux-x64"
- },
- "TargetsNonWindowsArg": {
- "value": ""
- },
- "CrossgenArg": {
- "value": ""
- }
- },
- "retentionRules": [
- {
- "branches": [
- "+refs/heads/*"
- ],
- "artifacts": [],
- "artifactTypesToDelete": [
- "FilePath",
- "SymbolStore"
- ],
- "daysToKeep": 10,
- "minimumToKeep": 1,
- "deleteBuildRecord": true,
- "deleteTestResults": true
- }
- ],
- "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(Rid)",
- "jobAuthorizationScope": "projectCollection",
- "jobTimeoutInMinutes": 240,
- "jobCancelTimeoutInMinutes": 5,
- "repository": {
- "properties": {
- "labelSources": "0",
- "reportBuildStatus": "true",
- "fetchDepth": "0",
- "gitLfsSupport": "false",
- "skipSyncSource": "false",
- "cleanOptions": "0",
- "checkoutNestedSubmodules": "false",
- "labelSourcesFormat": "$(build.buildNumber)"
- },
- "id": "670e3783-ab4f-44fc-9786-d332007da311",
- "type": "TfsGit",
- "name": "DotNet-CoreCLR-Trusted",
- "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-CoreCLR-Trusted",
- "defaultBranch": "refs/heads/master",
- "clean": "true",
- "checkoutSubmodules": false
- },
- "processParameters": {},
- "quality": "definition",
- "drafts": [],
- "queue": {
- "id": 36,
- "name": "DotNet-Build",
- "pool": {
- "id": 39,
- "name": "DotNet-Build"
- }
- },
- "id": 5159,
- "name": "Dotnet-CoreClr-Trusted-BuildTests",
- "path": "\\",
- "type": "build",
- "queueStatus": "enabled",
- "project": {
- "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
- "name": "DevDiv",
- "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ",
- "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
- "state": "wellFormed",
- "revision": 418098432,
- "visibility": "organization"
- }
-}
diff --git a/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json b/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
index 5255c56..6473066 100644
--- a/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
+++ b/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
@@ -303,7 +303,7 @@
"value": "linux-x64"
},
"TargetQueues": {
- "value": "debian.82.amd64,fedora.23.amd64,redhat.72.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1610.amd64"
+ "value": "debian.82.amd64,fedora.26.amd64,fedora.27.amd64,redhat.73.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1710.amd64,ubuntu.1804.amd64,opensuse.423.amd64,sles.12.amd64"
},
"TestProduct": {
"value": "coreclr"