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.

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

[pull] main from Azure:main #408

Merged
merged 12 commits into from
Feb 16, 2023
Merged
Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions eng/.docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@ known_content_issues:
- ['sdk/storage/README.md', '#3113']
- ['sdk/tools/azure-sdk-archetype/README.md', '#3113']
- ['sdk/tools/azure-sdk-build-tool/README.md', '#3113']
- ['sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/README.md', '#3113']
- ['sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/README.md', '#3113']
- ['sdk/appconfiguration/azure-spring-cloud-feature-management-web/README.md', '#3113']
- ['sdk/appconfiguration/spring-cloud-azure-appconfiguration-config-web/README.md', '#3113']
- ['sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/README.md', '#3113']
- ['sdk/appconfiguration/spring-cloud-azure-feature-management-web/README.md', '#3113']

package_indexing_exclusion_list:
- azure-loganalytics-sample
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,15 @@ private static ExternalApiStatus shouldExternalApiBeIgnored(TypeElement element)
|| "core.".regionMatches(0, className, 10, 5)
|| "cosmos.".regionMatches(0, className, 10, 7)
|| "data.schemaregistry.".regionMatches(0, className, 10, 20)
|| "data.appconfiguration.".regionMatches(0, className, 10, 22)
|| "json.".regionMatches(0, className, 10, 5)
|| "messaging.eventgrid.".regionMatches(0, className, 10, 20)
|| "messaging.eventhubs.".regionMatches(0, className, 10, 20)
|| "messaging.servicebus.".regionMatches(0, className, 10, 21)
|| "resourcemanager.".regionMatches(0, className, 10, 16)
|| "security.keyvault.".regionMatches(0, className, 10, 18)
|| "spring.cloud.config.".regionMatches(0, className, 10, 20)
|| "spring.cloud.feature.".regionMatches(0, className, 10, 21)
|| "storage.".regionMatches(0, className, 10, 8)) {
return ExternalApiStatus.SDK_CLASSES;
} else if ("perf.test.core.".regionMatches(0, className, 10, 15)) {
Expand Down
22 changes: 6 additions & 16 deletions eng/common/pipelines/templates/jobs/perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,15 @@ parameters:
- name: JobName
type: string
default: 'Perf'
- name: TimeoutInMinutes
type: number
default: '360'
- name: LinuxPool
type: string
default: 'azsdk-pool-mms-ubuntu-2004-perf'
- name: LinuxVmImage
type: string
default: 'MMSUbuntu20.04'
default: 'azsdk-pool-mms-ubuntu-2204-perf'
- name: WindowsPool
type: string
default: 'azsdk-pool-mms-win-2019-perf'
- name: WindowsVmImage
type: string
default: 'MMS2019'
default: 'azsdk-pool-mms-win-2022-perf'
- name: Language
type: string
default: ''
Expand Down Expand Up @@ -65,18 +62,16 @@ parameters:

jobs:
- job: ${{ parameters.JobName }}
timeoutInMinutes: 360
timeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
strategy:
matrix:
${{ if contains(parameters.OperatingSystems, 'Linux') }}:
Linux:
Pool: ${{ parameters.LinuxPool }}
OsVmImage: ${{ parameters.LinuxVmImage }}
MatrixName: 'Linux'
${{ if contains(parameters.OperatingSystems, 'Windows') }}:
Windows:
Pool: ${{ parameters.WindowsPool }}
OsVmImage: ${{ parameters.WindowsVmImage }}
MatrixName: 'Windows'
variables:
- ${{ parameters.Variables }}
Expand All @@ -87,7 +82,6 @@ jobs:
value: ''
pool:
name: $(Pool)
vmImage: $(OSVmImage)
steps:

- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
Expand All @@ -106,10 +100,6 @@ jobs:
Commitish: ${{ parameters.ToolsRepoCommitish }}
WorkingDirectory: $(System.DefaultWorkingDirectory)/azure-sdk-tools

- template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
parameters:
AgentImage: $(OSVmImage)

- ${{ parameters.InstallLanguageSteps }}

- template: /eng/common/TestResources/deploy-test-resources.yml
Expand Down
8 changes: 6 additions & 2 deletions eng/pipelines/templates/jobs/perf.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
parameters:
- name: TimeoutInMinutes
type: number
default: '360'
- name: LanguageVersion
type: string
default: '17'
Expand Down Expand Up @@ -30,10 +33,11 @@ parameters:
extends:
template: /eng/common/pipelines/templates/jobs/perf.yml
parameters:
Variables:
- template: /eng/pipelines/templates/variables/globals.yml
TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
Language: Java
LanguageVersion: ${{ parameters.LanguageVersion }}
Variables:
- template: /eng/pipelines/templates/variables/globals.yml
InstallLanguageSteps:
- task: JavaToolInstaller@0
inputs:
Expand Down
10 changes: 5 additions & 5 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-communication-email;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-developer-loadtesting;1.0.0-beta.2;1.0.0-beta.3
com.azure:azure-identity-extensions;1.1.1;1.2.0-beta.2
com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.11.0;2.12.0-beta.1
com.azure.spring:azure-spring-cloud-appconfiguration-config;2.11.0;2.12.0-beta.1
com.azure.spring:azure-spring-cloud-feature-management-web;2.10.0;2.11.0-beta.1
com.azure.spring:azure-spring-cloud-feature-management;2.10.0;2.11.0-beta.1
com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.11.0;2.12.0-beta.1
com.azure.spring:spring-cloud-azure-appconfiguration-config-web;2.11.0;4.0.0-beta.1
com.azure.spring:spring-cloud-azure-appconfiguration-config;2.11.0;4.0.0-beta.1
com.azure.spring:spring-cloud-azure-feature-management-web;2.10.0;4.0.0-beta.3
com.azure.spring:spring-cloud-azure-feature-management;2.10.0;4.0.0-beta.3
com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;2.11.0;4.0.0-beta.1
com.azure.spring:spring-cloud-azure-dependencies;4.6.0;4.7.0-beta.1
com.azure.spring:spring-messaging-azure;4.6.0;4.7.0-beta.1
com.azure.spring:spring-messaging-azure-eventhubs;4.6.0;4.7.0-beta.1
Expand Down
3 changes: 2 additions & 1 deletion sdk/anomalydetector/azure-ai-anomalydetector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jacoco.skip>true</jacoco.skip>
<jacoco.min.linecoverage>0.2</jacoco.min.linecoverage>
<jacoco.min.branchcoverage>0.2</jacoco.min.branchcoverage>
</properties>
<dependencies>
<dependency>
Expand Down
17 changes: 0 additions & 17 deletions sdk/anomalydetector/azure-ai-anomalydetector/swagger/README.md

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading