diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json index ed481485d6ad..e303023fa2b7 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json @@ -870,8 +870,7 @@ "PlatformProperties": { "description": "The platform properties against which the run has to happen.", "required": [ - "os", - "architecture" + "os" ], "type": "object", "properties": { @@ -1149,8 +1148,8 @@ "description": "The type of the step.", "enum": [ "Docker", - "BuildTask", - "RunTask" + "FileTask", + "EncodedTask" ], "type": "string", "readOnly": true, @@ -1486,8 +1485,8 @@ "description": "The type of the step.", "enum": [ "Docker", - "BuildTask", - "RunTask" + "FileTask", + "EncodedTask" ], "type": "string", "readOnly": true, @@ -1810,11 +1809,11 @@ } } }, - "BuildTaskRequest": { - "description": "The request parameters for a quick task build.", + "FileTaskRunRequest": { + "description": "The request parameters for a scheduling run against a task file.", "required": [ "type", - "definitionFilePath", + "taskFilePath", "sourceLocation", "platform" ], @@ -1825,7 +1824,7 @@ } ], "properties": { - "definitionFilePath": { + "taskFilePath": { "description": "The template/definition file path relative to the source.", "type": "string" }, @@ -1861,7 +1860,7 @@ "description": "The machine configuration of the build agent." } }, - "x-ms-discriminator-value": "BuildTaskRequest" + "x-ms-discriminator-value": "FileTaskRunRequest" }, "SetValue": { "description": "The properties of a overridable value that can be passed to a task template.", @@ -1913,11 +1912,11 @@ }, "x-ms-discriminator-value": "TaskRunRequest" }, - "QuickTaskRunRequest": { + "EncodedTaskRunRequest": { "description": "The parameters for a quick task run request.", "required": [ "type", - "taskDefinitionContent", + "encodedTaskContent", "platform" ], "type": "object", @@ -1927,11 +1926,11 @@ } ], "properties": { - "taskDefinitionContent": { + "encodedTaskContent": { "description": "Base64 encoded value of the template/definition file content.", "type": "string" }, - "valuesContent": { + "encodedValuesContent": { "description": "Base64 encoded value of the parameters/values file content.", "type": "string" }, @@ -1959,7 +1958,7 @@ "description": "The machine configuration of the build agent." } }, - "x-ms-discriminator-value": "QuickTaskRunRequest" + "x-ms-discriminator-value": "EncodedTaskRunRequest" }, "DockerBuildStep": { "description": "The Docker build step.", @@ -2008,10 +2007,10 @@ }, "x-ms-discriminator-value": "Docker" }, - "BuildTaskStep": { - "description": "The properties of a build task step.", + "FileTaskStep": { + "description": "The properties of a task step.", "required": [ - "definitionFilePath" + "taskFilePath" ], "type": "object", "allOf": [ @@ -2020,8 +2019,8 @@ } ], "properties": { - "definitionFilePath": { - "description": "The build task template/definition file path relative to the source context.", + "taskFilePath": { + "description": "The task template/definition file path relative to the source context.", "type": "string" }, "valuesFilePath": { @@ -2040,12 +2039,12 @@ "type": "string" } }, - "x-ms-discriminator-value": "BuildTask" + "x-ms-discriminator-value": "FileTask" }, - "RunTaskStep": { - "description": "The properties of a generic task run step.", + "EncodedTaskStep": { + "description": "The properties of a encoded task step.", "required": [ - "taskDefinitionContent" + "encodedTaskContent" ], "type": "object", "allOf": [ @@ -2054,11 +2053,11 @@ } ], "properties": { - "taskDefinitionContent": { + "encodedTaskContent": { "description": "Base64 encoded value of the template/definition file content.", "type": "string" }, - "valuesContent": { + "encodedValuesContent": { "description": "Base64 encoded value of the parameters/values file content.", "type": "string" }, @@ -2070,7 +2069,7 @@ } } }, - "x-ms-discriminator-value": "RunTask" + "x-ms-discriminator-value": "EncodedTask" }, "DockerBuildStepUpdateParameters": { "description": "The properties for updating a docker build step.", @@ -2114,8 +2113,8 @@ }, "x-ms-discriminator-value": "Docker" }, - "BuildTaskStepUpdateParameters": { - "description": "The properties of updating a build task step.", + "FileTaskStepUpdateParameters": { + "description": "The properties of updating a task step.", "type": "object", "allOf": [ { @@ -2123,12 +2122,12 @@ } ], "properties": { - "definitionFilePath": { - "description": "The build task template/definition file path relative to the source context.", + "taskFilePath": { + "description": "The task template/definition file path relative to the source context.", "type": "string" }, "valuesFilePath": { - "description": "The task values/parameters file path relative to the source context.", + "description": "The values/parameters file path relative to the source context.", "type": "string" }, "values": { @@ -2143,10 +2142,10 @@ "type": "string" } }, - "x-ms-discriminator-value": "BuildTask" + "x-ms-discriminator-value": "FileTask" }, - "RunTaskStepUpdateParameters": { - "description": "The properties for updating generic task run step.", + "EncodedTaskStepUpdateParameters": { + "description": "The properties for updating encoded task step.", "type": "object", "allOf": [ { @@ -2154,11 +2153,11 @@ } ], "properties": { - "taskDefinitionContent": { + "encodedTaskContent": { "description": "Base64 encoded value of the template/definition file content.", "type": "string" }, - "valuesContent": { + "encodedValuesContent": { "description": "Base64 encoded value of the parameters/values file content.", "type": "string" }, @@ -2170,7 +2169,7 @@ } } }, - "x-ms-discriminator-value": "RunTask" + "x-ms-discriminator-value": "EncodedTask" } }, "parameters": { diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_QuickTaskRun.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_EncodedTaskRun.json similarity index 66% rename from specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_QuickTaskRun.json rename to specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_EncodedTaskRun.json index 08185bfe2c9d..beb63ea9c8a0 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_QuickTaskRun.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_EncodedTaskRun.json @@ -5,7 +5,7 @@ "registryName": "myRegistry", "api-version": "2018-09-01", "runRequest": { - "type": "QuickTaskRunRequest", + "type": "EncodedTaskRunRequest", "values": [ { "name": "mytestargument", @@ -19,14 +19,13 @@ } ], "platform": { - "os": "Linux", - "architecture": "amd64" + "os": "Linux" }, "agentConfiguration": { "cpu": 2 }, - "taskDefinitionContent": "c3RlcHM6Cnt7IGlmIFZhbHVlcy5lbnZpcm9ubWVudCA9PSAncHJvZCcgfX0KICAtIHJ1bjogcHJvZCBzZXR1cAp7eyBlbHNlIGlmIFZhbHVlcy5lbnZpcm9ubWVudCA9PSAnc3RhZ2luZycgfX0KICAtIHJ1bjogc3RhZ2luZyBzZXR1cAp7eyBlbHNlIH19CiAgLSBydW46IGRlZmF1bHQgc2V0dXAKe3sgZW5kIH19CgogIC0gcnVuOiBidWlsZCAtdCBGYW5jeVRoaW5nOnt7LlZhbHVlcy5lbnZpcm9ubWVudH19LXt7LlZhbHVlcy52ZXJzaW9ufX0gLgoKcHVzaDogWydGYW5jeVRoaW5nOnt7LlZhbHVlcy5lbnZpcm9ubWVudH19LXt7LlZhbHVlcy52ZXJzaW9ufX0nXQ==", - "valuesContent":"ZW52aXJvbm1lbnQ6IHByb2QKdmVyc2lvbjogMQ==" + "encodedTaskContent": "c3RlcHM6Cnt7IGlmIFZhbHVlcy5lbnZpcm9ubWVudCA9PSAncHJvZCcgfX0KICAtIHJ1bjogcHJvZCBzZXR1cAp7eyBlbHNlIGlmIFZhbHVlcy5lbnZpcm9ubWVudCA9PSAnc3RhZ2luZycgfX0KICAtIHJ1bjogc3RhZ2luZyBzZXR1cAp7eyBlbHNlIH19CiAgLSBydW46IGRlZmF1bHQgc2V0dXAKe3sgZW5kIH19CgogIC0gcnVuOiBidWlsZCAtdCBGYW5jeVRoaW5nOnt7LlZhbHVlcy5lbnZpcm9ubWVudH19LXt7LlZhbHVlcy52ZXJzaW9ufX0gLgoKcHVzaDogWydGYW5jeVRoaW5nOnt7LlZhbHVlcy5lbnZpcm9ubWVudH19LXt7LlZhbHVlcy52ZXJzaW9ufX0nXQ==", + "encodedValuesContent":"ZW52aXJvbm1lbnQ6IHByb2QKdmVyc2lvbjogMQ==" } }, "responses": { diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_BuildTask.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_FileTaskRun.json similarity index 92% rename from specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_BuildTask.json rename to specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_FileTaskRun.json index 21ba6d402ad2..b85267583849 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_BuildTask.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/examples/RegistriesScheduleRun_FileTaskRun.json @@ -5,7 +5,7 @@ "registryName": "myRegistry", "api-version": "2018-09-01", "runRequest": { - "type": "BuildTaskRequest", + "type": "FileTaskRunRequest", "sourceLocation": "https://myaccount.blob.core.windows.net/sascontainer/source.zip?sv=2015-04-05&st=2015-04-29T22%3A18%3A26Z&se=2015-04-30T02%3A23%3A26Z&sr=b&sp=rw&sip=168.1.5.60-168.1.5.70&spr=https&sig=Z%2FRHIX5Xcg0Mq2rqI3OlWTjEg2tYkboXr1P9ZUXDtkk%3D", "values": [ { @@ -20,13 +20,12 @@ } ], "platform": { - "os": "Linux", - "architecture": "amd64" + "os": "Linux" }, "agentConfiguration": { "cpu": 2 }, - "templateFilePath": "acb.yaml", + "taskFilePath": "acb.yaml", "valuesFilePath":"prod-values.yaml" } },