Update azopenai* to use hardcoded variable group config (#23748)
* Update azopenai* to use hardcoded variable group config * Remove bicep template for ai services
This commit is contained in:
Ben Broderick Phillips
GitHub
Родитель
662a88906f
Коммит
e8ec092d84
|
|
@ -23,23 +23,35 @@ pr:
|
|||
- sdk/ai/azopenai
|
||||
|
||||
extends:
|
||||
template: /eng/pipelines/templates/jobs/archetype-sdk-client.yml
|
||||
parameters:
|
||||
# We need to allow for longer retry times with tests that run against the public endpoint
|
||||
# which throttles under load. Note, I left a little wiggle room since the TimeoutInMinutes
|
||||
# controls the overall pipeline and TestRunTime configures the individual `go test -timeout` parameter.
|
||||
TimeoutInMinutes: 35
|
||||
TestRunTime: 30m
|
||||
ServiceDirectory: "ai/azopenai"
|
||||
RunLiveTests: true
|
||||
UsePipelineProxy: false
|
||||
CloudConfig:
|
||||
Public:
|
||||
SubscriptionConfigurations:
|
||||
- $(sub-config-openai-test-resources) # TestSecrets-openai
|
||||
EnvVars:
|
||||
AZURE_TEST_RUN_LIVE: "true" # use when utilizing the New-TestResources Script
|
||||
AZURE_CLIENT_ID: $(AZOPENAI_CLIENT_ID)
|
||||
AZURE_CLIENT_SECRET: $(AZOPENAI_CLIENT_SECRET)
|
||||
AZURE_TENANT_ID: $(AZOPENAI_TENANT_ID)
|
||||
AZURE_SUBSCRIPTION_ID: $(AZOPENAI_SUBSCRIPTION_ID)
|
||||
template: /eng/pipelines/templates/jobs/archetype-sdk-client.yml
|
||||
parameters:
|
||||
# We need to allow for longer retry times with tests that run against the public endpoint
|
||||
# which throttles under load. Note, I left a little wiggle room since the TimeoutInMinutes
|
||||
# controls the overall pipeline and TestRunTime configures the individual `go test -timeout` parameter.
|
||||
TimeoutInMinutes: 35
|
||||
TestRunTime: 30m
|
||||
ServiceDirectory: "ai/azopenai"
|
||||
RunLiveTests: true
|
||||
UsePipelineProxy: false
|
||||
CloudConfig:
|
||||
Public:
|
||||
ServiceConnection: azure-sdk-tests-openai
|
||||
EnvVars:
|
||||
AZURE_TEST_RUN_LIVE: "true" # use when utilizing the New-TestResources Script
|
||||
AOAI_ASSISTANTS_ENDPOINT: $(GO-AOAI-ASSISTANTS-ENDPOINT)
|
||||
AOAI_ASSISTANTS_KEY: $(GO-AOAI-ASSISTANTS-KEY)
|
||||
AOAI_ENDPOINT_SWECENTRAL: $(GO-AOAI-ENDPOINT-SWECENTRAL)
|
||||
AOAI_ENDPOINT_SWECENTRAL_API_KEY: $(GO-AOAI-ENDPOINT-SWECENTRAL-API-KEY)
|
||||
AOAI_ENDPOINT_USEAST: $(GO-AOAI-ENDPOINT-USEAST)
|
||||
AOAI_ENDPOINT_USEAST_API_KEY: $(GO-AOAI-ENDPOINT-USEAST-API-KEY)
|
||||
AOAI_ENDPOINT_USEAST2: $(GO-AOAI-ENDPOINT-USEAST2)
|
||||
AOAI_ENDPOINT_USEAST2_API_KEY: $(GO-AOAI-ENDPOINT-USEAST2-API-KEY)
|
||||
AOAI_ENDPOINT_USNORTHCENTRAL: $(GO-AOAI-ENDPOINT-USNORTHCENTRAL)
|
||||
AOAI_ENDPOINT_USNORTHCENTRAL_API_KEY: $(GO-AOAI-ENDPOINT-USNORTHCENTRAL-API-KEY)
|
||||
COGNITIVE_SEARCH_API_ENDPOINT: $(GO-COGNITIVE-SEARCH-API-ENDPOINT)
|
||||
COGNITIVE_SEARCH_API_INDEX: $(GO-COGNITIVE-SEARCH-API-INDEX)
|
||||
COGNITIVE_SEARCH_API_KEY: $(GO-COGNITIVE-SEARCH-API-KEY)
|
||||
legacy: $(GO-legacy)
|
||||
OPENAI_API_KEY: $(GO-OPENAI-API-KEY)
|
||||
OPENAI_ENDPOINT: $(GO-OPENAI-ENDPOINT)
|
||||
USE_TOKEN_CREDS: $(GO-USE-TOKEN-CREDS)
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT License.
|
||||
|
||||
// This is a placeholder file to trigger environment variable setting via New-TestResources.ps1
|
||||
|
||||
@description('The base resource name.')
|
||||
param baseName string = resourceGroup().name
|
||||
|
||||
@description('Which Azure Region to deploy the resource to. Defaults to the resource group location.')
|
||||
param location string = resourceGroup().location
|
||||
|
||||
@description('The principal to assign the role to. This is application object id.')
|
||||
param testApplicationOid string
|
||||
|
|
@ -23,23 +23,35 @@ pr:
|
|||
- sdk/ai/azopenaiassistants
|
||||
|
||||
extends:
|
||||
template: /eng/pipelines/templates/jobs/archetype-sdk-client.yml
|
||||
parameters:
|
||||
# We need to allow for longer retry times with tests that run against the public endpoint
|
||||
# which throttles under load. Note, I left a little wiggle room since the TimeoutInMinutes
|
||||
# controls the overall pipeline and TestRunTime configures the individual `go test -timeout` parameter.
|
||||
TimeoutInMinutes: 35
|
||||
TestRunTime: 30m
|
||||
ServiceDirectory: "ai/azopenaiassistants"
|
||||
RunLiveTests: true
|
||||
UsePipelineProxy: false
|
||||
CloudConfig:
|
||||
Public:
|
||||
SubscriptionConfigurations:
|
||||
- $(sub-config-openai-test-resources) # TestSecrets-openai
|
||||
EnvVars:
|
||||
AZURE_TEST_RUN_LIVE: "true" # use when utilizing the New-TestResources Script
|
||||
AZURE_CLIENT_ID: $(AZOPENAIASSISTANTS_CLIENT_ID)
|
||||
AZURE_CLIENT_SECRET: $(AZOPENAIASSISTANTS_CLIENT_SECRET)
|
||||
AZURE_TENANT_ID: $(AZOPENAIASSISTANTS_TENANT_ID)
|
||||
AZURE_SUBSCRIPTION_ID: $(AZOPENAIASSISTANTS_SUBSCRIPTION_ID)
|
||||
template: /eng/pipelines/templates/jobs/archetype-sdk-client.yml
|
||||
parameters:
|
||||
# We need to allow for longer retry times with tests that run against the public endpoint
|
||||
# which throttles under load. Note, I left a little wiggle room since the TimeoutInMinutes
|
||||
# controls the overall pipeline and TestRunTime configures the individual `go test -timeout` parameter.
|
||||
TimeoutInMinutes: 35
|
||||
TestRunTime: 30m
|
||||
ServiceDirectory: "ai/azopenaiassistants"
|
||||
RunLiveTests: true
|
||||
UsePipelineProxy: false
|
||||
CloudConfig:
|
||||
Public:
|
||||
ServiceConnection: azure-sdk-tests-openai
|
||||
EnvVars:
|
||||
AZURE_TEST_RUN_LIVE: "true" # use when utilizing the New-TestResources Script
|
||||
AOAI_ASSISTANTS_ENDPOINT: $(GO-AOAI-ASSISTANTS-ENDPOINT)
|
||||
AOAI_ASSISTANTS_KEY: $(GO-AOAI-ASSISTANTS-KEY)
|
||||
AOAI_ENDPOINT_SWECENTRAL: $(GO-AOAI-ENDPOINT-SWECENTRAL)
|
||||
AOAI_ENDPOINT_SWECENTRAL_API_KEY: $(GO-AOAI-ENDPOINT-SWECENTRAL-API-KEY)
|
||||
AOAI_ENDPOINT_USEAST: $(GO-AOAI-ENDPOINT-USEAST)
|
||||
AOAI_ENDPOINT_USEAST_API_KEY: $(GO-AOAI-ENDPOINT-USEAST-API-KEY)
|
||||
AOAI_ENDPOINT_USEAST2: $(GO-AOAI-ENDPOINT-USEAST2)
|
||||
AOAI_ENDPOINT_USEAST2_API_KEY: $(GO-AOAI-ENDPOINT-USEAST2-API-KEY)
|
||||
AOAI_ENDPOINT_USNORTHCENTRAL: $(GO-AOAI-ENDPOINT-USNORTHCENTRAL)
|
||||
AOAI_ENDPOINT_USNORTHCENTRAL_API_KEY: $(GO-AOAI-ENDPOINT-USNORTHCENTRAL-API-KEY)
|
||||
COGNITIVE_SEARCH_API_ENDPOINT: $(GO-COGNITIVE-SEARCH-API-ENDPOINT)
|
||||
COGNITIVE_SEARCH_API_INDEX: $(GO-COGNITIVE-SEARCH-API-INDEX)
|
||||
COGNITIVE_SEARCH_API_KEY: $(GO-COGNITIVE-SEARCH-API-KEY)
|
||||
legacy: $(GO-legacy)
|
||||
OPENAI_API_KEY: $(GO-OPENAI-API-KEY)
|
||||
OPENAI_ENDPOINT: $(GO-OPENAI-ENDPOINT)
|
||||
USE_TOKEN_CREDS: $(GO-USE-TOKEN-CREDS)
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT License.
|
||||
|
||||
// This is a placeholder file to trigger environment variable setting via New-TestResources.ps1
|
||||
|
||||
@description('The base resource name.')
|
||||
param baseName string = resourceGroup().name
|
||||
|
||||
@description('Which Azure Region to deploy the resource to. Defaults to the resource group location.')
|
||||
param location string = resourceGroup().location
|
||||
|
||||
@description('The principal to assign the role to. This is application object id.')
|
||||
param testApplicationOid string
|
||||
|
|
@ -36,11 +36,23 @@ extends:
|
|||
ExcludeGoNMinus2: true
|
||||
CloudConfig:
|
||||
Public:
|
||||
SubscriptionConfigurations:
|
||||
- $(sub-config-openai-test-resources) # TestSecrets-openai
|
||||
ServiceConnection: azure-sdk-tests-openai
|
||||
EnvVars:
|
||||
AZURE_TEST_RUN_LIVE: "true" # use when utilizing the New-TestResources Script
|
||||
AZURE_CLIENT_ID: $(AZOPENAIEXTENSIONS_CLIENT_ID)
|
||||
AZURE_CLIENT_SECRET: $(AZOPENAIEXTENSIONS_CLIENT_SECRET)
|
||||
AZURE_TENANT_ID: $(AZOPENAIEXTENSIONS_TENANT_ID)
|
||||
AZURE_SUBSCRIPTION_ID: $(AZOPENAIEXTENSIONS_SUBSCRIPTION_ID)
|
||||
AOAI_ASSISTANTS_ENDPOINT: $(GO-AOAI-ASSISTANTS-ENDPOINT)
|
||||
AOAI_ASSISTANTS_KEY: $(GO-AOAI-ASSISTANTS-KEY)
|
||||
AOAI_ENDPOINT_SWECENTRAL: $(GO-AOAI-ENDPOINT-SWECENTRAL)
|
||||
AOAI_ENDPOINT_SWECENTRAL_API_KEY: $(GO-AOAI-ENDPOINT-SWECENTRAL-API-KEY)
|
||||
AOAI_ENDPOINT_USEAST: $(GO-AOAI-ENDPOINT-USEAST)
|
||||
AOAI_ENDPOINT_USEAST_API_KEY: $(GO-AOAI-ENDPOINT-USEAST-API-KEY)
|
||||
AOAI_ENDPOINT_USEAST2: $(GO-AOAI-ENDPOINT-USEAST2)
|
||||
AOAI_ENDPOINT_USEAST2_API_KEY: $(GO-AOAI-ENDPOINT-USEAST2-API-KEY)
|
||||
AOAI_ENDPOINT_USNORTHCENTRAL: $(GO-AOAI-ENDPOINT-USNORTHCENTRAL)
|
||||
AOAI_ENDPOINT_USNORTHCENTRAL_API_KEY: $(GO-AOAI-ENDPOINT-USNORTHCENTRAL-API-KEY)
|
||||
COGNITIVE_SEARCH_API_ENDPOINT: $(GO-COGNITIVE-SEARCH-API-ENDPOINT)
|
||||
COGNITIVE_SEARCH_API_INDEX: $(GO-COGNITIVE-SEARCH-API-INDEX)
|
||||
COGNITIVE_SEARCH_API_KEY: $(GO-COGNITIVE-SEARCH-API-KEY)
|
||||
legacy: $(GO-legacy)
|
||||
OPENAI_API_KEY: $(GO-OPENAI-API-KEY)
|
||||
OPENAI_ENDPOINT: $(GO-OPENAI-ENDPOINT)
|
||||
USE_TOKEN_CREDS: $(GO-USE-TOKEN-CREDS)
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT License.
|
||||
|
||||
// This is a placeholder file to trigger environment variable setting via New-TestResources.ps1
|
||||
|
||||
@description('The base resource name.')
|
||||
param baseName string = resourceGroup().name
|
||||
|
||||
@description('Which Azure Region to deploy the resource to. Defaults to the resource group location.')
|
||||
param location string = resourceGroup().location
|
||||
|
||||
@description('The principal to assign the role to. This is application object id.')
|
||||
param testApplicationOid string
|
||||
Загрузка…
Ссылка в новой задаче