Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ContextPath and source location URL for encode task and run type, support for pull request based triggers #4026

Merged
merged 2 commits into from
Oct 1, 2018
Merged

Add ContextPath and source location URL for encode task and run type, support for pull request based triggers #4026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13f78c9
Add ContextPath and source location URL for encode task and run type,…
mnltejaswini Sep 28, 2018
13e400b
Update readme to fix the name conflict in autorest codegen
mnltejaswini Sep 28, 2018
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
94 changes: 47 additions & 47 deletions ...source-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,9 @@
"description": "The type of run.",
"enum": [
"QuickBuild",
"AutoBuild"
"QuickRun",
"AutoBuild",
"AutoRun"
],
"type": "string",
"x-ms-enum": {
Expand All @@ -740,7 +742,7 @@
"type": "string"
},
"outputImages": {
"description": "The list of all images that were generated from the run. This is applicable if the run is of type Build.",
"description": "The list of all images that were generated from the run. This is applicable if the run generates base image dependencies.",
"type": "array",
"items": {
"$ref": "#/definitions/ImageDescriptor"
Expand All @@ -752,7 +754,7 @@
},
"imageUpdateTrigger": {
"$ref": "#/definitions/ImageUpdateTrigger",
"description": "The image update trigger that caused the run. This is applicable if the task is of build type."
"description": "The image update trigger that caused the run. This is applicable if the task has base image trigger configured."
},
"sourceTrigger": {
"$ref": "#/definitions/SourceTriggerDescriptor",
Expand Down Expand Up @@ -968,7 +970,9 @@
"description": "The type of run.",
"enum": [
"QuickBuild",
"AutoBuild"
"QuickRun",
"AutoBuild",
"AutoRun"
],
"type": "string",
"x-ms-enum": {
Expand Down Expand Up @@ -1165,12 +1169,16 @@
"$ref": "#/definitions/BaseImageDependency"
},
"readOnly": true
},
"contextPath": {
"description": "The URL(absolute or relative) of the source context for the task step.",
"type": "string"
}
},
"discriminator": "type"
},
"TriggerProperties": {
"description": "The properties of a build trigger.",
"description": "The properties of a trigger.",
"type": "object",
"properties": {
"sourceTriggers": {
Expand Down Expand Up @@ -1238,7 +1246,8 @@
"type": "array",
"items": {
"enum": [
"commit"
"commit",
"pullrequest"
],
"type": "string",
"x-ms-enum": {
Expand All @@ -1248,7 +1257,7 @@
}
},
"status": {
"description": "The current status of build trigger.",
"description": "The current status of trigger.",
"enum": [
"Disabled",
"Enabled"
Expand Down Expand Up @@ -1286,7 +1295,7 @@
}
},
"status": {
"description": "The current status of build trigger.",
"description": "The current status of trigger.",
"enum": [
"Disabled",
"Enabled"
Expand Down Expand Up @@ -1494,12 +1503,16 @@
"name": "StepType",
"modelAsString": true
}
},
"contextPath": {
"description": "The URL(absolute or relative) of the source context for the task step.",
"type": "string"
}
},
"discriminator": "type"
},
"TriggerUpdateParameters": {
"description": "The properties for updating build triggers.",
"description": "The properties for updating triggers.",
"type": "object",
"properties": {
"sourceTriggers": {
Expand Down Expand Up @@ -1531,7 +1544,8 @@
"type": "array",
"items": {
"enum": [
"commit"
"commit",
"pullrequest"
],
"type": "string",
"x-ms-enum": {
Expand All @@ -1541,7 +1555,7 @@
}
},
"status": {
"description": "The current status of build trigger.",
"description": "The current status of trigger.",
"enum": [
"Disabled",
"Enabled"
Expand Down Expand Up @@ -1578,7 +1592,7 @@
}
},
"status": {
"description": "The current status of build trigger.",
"description": "The current status of trigger.",
"enum": [
"Disabled",
"Enabled"
Expand Down Expand Up @@ -1725,7 +1739,6 @@
"required": [
"type",
"dockerFilePath",
"sourceLocation",
"platform"
],
"type": "object",
Expand Down Expand Up @@ -1763,25 +1776,25 @@
"$ref": "#/definitions/Argument"
}
},
"sourceLocation": {
"description": "The URL(absolute or relative) of the source that needs to be built. For Docker build, it can be an URL to a tar or github repoistory as supported by Docker.\r\nIf it is relative URL, the relative path should be obtained from calling getSourceUploadUrl API.",
"type": "string"
},
"timeout": {
"format": "int32",
"description": "Build timeout in seconds.",
"description": "Run timeout in seconds.",
"default": 3600,
"maximum": 28800,
"minimum": 300,
"type": "integer"
},
"platform": {
"$ref": "#/definitions/PlatformProperties",
"description": "The platform properties against which the build will happen."
"description": "The platform properties against which the run has to happen."
},
"agentConfiguration": {
"$ref": "#/definitions/AgentProperties",
"description": "The machine configuration of the build agent."
"description": "The machine configuration of the run agent."
},
"sourceLocation": {
"description": "The URL(absolute or relative) of the source context. It can be an URL to a tar or git repoistory.\r\nIf it is relative URL, the relative path should be obtained from calling listBuildSourceUploadUrl API.",
"type": "string"
}
},
"x-ms-discriminator-value": "DockerBuildRequest"
Expand Down Expand Up @@ -1814,7 +1827,6 @@
"required": [
"type",
"taskFilePath",
"sourceLocation",
"platform"
],
"type": "object",
Expand All @@ -1839,25 +1851,25 @@
"$ref": "#/definitions/SetValue"
}
},
"sourceLocation": {
"description": "The URL(absolute or relative) of the source that needs to be built. For Docker build, it can be an URL to a tar or github repoistory as supported by Docker.\r\nIf it is relative URL, the relative path should be obtained from calling getSourceUploadUrl API.",
"type": "string"
},
"timeout": {
"format": "int32",
"description": "Build timeout in seconds.",
"description": "Run timeout in seconds.",
"default": 3600,
"maximum": 28800,
"minimum": 300,
"type": "integer"
},
"platform": {
"$ref": "#/definitions/PlatformProperties",
"description": "The platform properties against which the build will happen."
"description": "The platform properties against which the run has to happen."
},
"agentConfiguration": {
"$ref": "#/definitions/AgentProperties",
"description": "The machine configuration of the build agent."
"description": "The machine configuration of the run agent."
},
"sourceLocation": {
"description": "The URL(absolute or relative) of the source context. It can be an URL to a tar or git repoistory.\r\nIf it is relative URL, the relative path should be obtained from calling listBuildSourceUploadUrl API.",
"type": "string"
}
},
"x-ms-discriminator-value": "FileTaskRunRequest"
Expand Down Expand Up @@ -1943,19 +1955,23 @@
},
"timeout": {
"format": "int32",
"description": "Build timeout in seconds.",
"description": "Run timeout in seconds.",
"default": 3600,
"maximum": 28800,
"minimum": 300,
"type": "integer"
},
"platform": {
"$ref": "#/definitions/PlatformProperties",
"description": "The platform properties against which the build will happen."
"description": "The platform properties against which the run has to happen."
},
"agentConfiguration": {
"$ref": "#/definitions/AgentProperties",
"description": "The machine configuration of the build agent."
"description": "The machine configuration of the run agent."
},
"sourceLocation": {
"description": "The URL(absolute or relative) of the source context. It can be an URL to a tar or git repoistory.\r\nIf it is relative URL, the relative path should be obtained from calling listBuildSourceUploadUrl API.",
"type": "string"
}
},
"x-ms-discriminator-value": "EncodedTaskRunRequest"
Expand Down Expand Up @@ -1999,10 +2015,6 @@
"items": {
"$ref": "#/definitions/Argument"
}
},
"contextPath": {
"description": "The URL(absolute or relative) of the source context for the build task.\r\nIf it is relative, the context will be relative to the source repository URL of the build task.",
"type": "string"
}
},
"x-ms-discriminator-value": "Docker"
Expand Down Expand Up @@ -2033,10 +2045,6 @@
"items": {
"$ref": "#/definitions/SetValue"
}
},
"contextPath": {
"description": "The URL(absolute or relative) of the source context for the build task.\r\nIf it is relative, the context will be relative to the source repository URL of the build task.",
"type": "string"
}
},
"x-ms-discriminator-value": "FileTask"
Expand Down Expand Up @@ -2105,10 +2113,6 @@
"items": {
"$ref": "#/definitions/Argument"
}
},
"contextPath": {
"description": "The URL(absolute or relative) of the source context for the build task.\r\nIf it is relative, the context will be relative to the source repository URL of the build task.",
"type": "string"
}
},
"x-ms-discriminator-value": "Docker"
Expand Down Expand Up @@ -2136,10 +2140,6 @@
"items": {
"$ref": "#/definitions/SetValue"
}
},
"contextPath": {
"description": "The URL(absolute or relative) of the source context for the build task.\r\nIf it is relative, the context will be relative to the source repository URL of the build task.",
"type": "string"
}
},
"x-ms-discriminator-value": "FileTask"
Expand Down
6 changes: 6 additions & 0 deletions specification/containerregistry/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ tag: package-2018-09
These settings apply only when `--tag=package-2018-09` is specified on the command line.

``` yaml $(tag) == 'package-2018-09'

csharp:
# stop the simplifier from making Task conflict:
skip-simplifier-on-namespace:
- System.Threading.Tasks

input-file:
- Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json
- Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json
Expand Down