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

Synced websockets feature branch with main. #3945

Merged
merged 54 commits into from
Sep 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
e0706ba
Stress test (#3820)
gearama Jul 13, 2022
a3926d6
Fixed the metadata for better handling (#3824)
azure-sdk Jul 13, 2022
593437b
Update attestation core vcpkg dependency to latest GA version that is…
ahsonkhan Jul 15, 2022
7bf6735
Remove winhttp (#3832)
gearama Jul 15, 2022
73bb61d
Move perf.yml to eng/common (#3833)
azure-sdk Jul 15, 2022
cff96f8
Sync eng/common directory with azure-sdk-tools for PR 3656 (#3834)
azure-sdk Jul 15, 2022
c3ecbcd
Update casing for 'verison' (#3821)
azure-sdk Jul 19, 2022
b95cdcf
Print additional result summary formats to pipelines UI (#3842)
azure-sdk Jul 19, 2022
584f83c
Sync eng/common directory with azure-sdk-tools for PR 3702 (#3843)
azure-sdk Jul 20, 2022
6c74e57
Fix incorrect failure notification in vcpkg publishing (#3838)
danieljurek Jul 21, 2022
992a3a9
Helm charts (#3841)
gearama Jul 25, 2022
8cb8a43
Sync eng/common directory with azure-sdk-tools for PR 3661 (#3846)
azure-sdk Jul 25, 2022
ea2d3ad
Sync eng/common directory with azure-sdk-tools for PR 3735 (#3845)
azure-sdk Jul 25, 2022
a75c95b
Increment version for keyvault releases (#3809)
azure-sdk Jul 25, 2022
c437f5a
Removed hard dependency on opentelemetry version (#3844)
LarryOsterman Jul 26, 2022
209dcae
Revert "Add full clone fallback to sparse checkout (#3661)" (#3851)
azure-sdk Jul 26, 2022
f2efced
Sync eng/common directory with azure-sdk-tools for PR 3753 (#3857)
azure-sdk Jul 27, 2022
9843c71
Bump macOs version to macos-11 (#3853)
sima-zhu Jul 28, 2022
1dab2c1
Update CHANGELOG.md
RickWinter Jul 28, 2022
9eae0df
Fix misleading step name in az module install (#3859)
azure-sdk Jul 29, 2022
86b3305
Retry poll calls on EINTR (#3858)
johnwheffner Aug 1, 2022
9a04638
Fix bad path to sample matrix json (#3860)
azure-sdk Aug 2, 2022
e8906ca
Sync eng/common directory with azure-sdk-tools for PR 3826 (#3863)
azure-sdk Aug 3, 2022
755d717
Core August releases (#3862)
antkmsft Aug 4, 2022
5a8d623
Increment version for core releases (#3865)
azure-sdk Aug 4, 2022
5411134
Storage Aug GA release (#3864)
Jinming-Hu Aug 5, 2022
bf65862
CG only runs on internal (#3866)
JonathanCrd Aug 5, 2022
93991ab
STG 79 80 81 Features (#3850)
Jinming-Hu Aug 5, 2022
5954ef7
Sync eng/common directory with azure-sdk-tools for PR 3860 (#3871)
azure-sdk Aug 5, 2022
1f82325
Storage August Preview Release (#3868)
Jinming-Hu Aug 9, 2022
b5c456c
Increment version for storage releases (#3875)
azure-sdk Aug 9, 2022
e019b3e
Fix an issue that reason phrase is missing as expected from HTTP/2 se…
keshen-msft Aug 10, 2022
c152c05
Update CODEOWNERS (#3881)
microzchang Aug 11, 2022
82d4446
updated targeted proxy version to one that properly allows consumptio…
azure-sdk Aug 15, 2022
2dd3dbe
Fix `azure-storage-blobs-cpp` beta install (#3889)
antkmsft Aug 17, 2022
634df13
Fixed #3899 - Handle new OSX version correctly; reformatted platform-…
LarryOsterman Aug 24, 2022
f8c41df
Simpler get-binarysizes check for OSX (#3901)
LarryOsterman Aug 24, 2022
9afb371
Sync eng/common directory with azure-sdk-tools for PR 3874 (#3907)
azure-sdk Aug 25, 2022
221a175
File Share Features until STG82 (#3908)
Jinming-Hu Aug 29, 2022
3756ae6
Empty file or existing file won't be created/overwritten if the blob …
Jinming-Hu Aug 30, 2022
db99ee1
Remove unnecessary checkout: none that causes conflicts with sparse c…
azure-sdk Sep 1, 2022
825d2dd
Core September Release (#3913)
antkmsft Sep 1, 2022
81b7336
Increment package version after release of azure-core (#3919)
azure-sdk Sep 1, 2022
737a09f
Migrate SkipDefaultCheckout to SkipCheckoutNone (#3916)
azure-sdk Sep 1, 2022
e29fe9b
Storage Sept Release (#3914)
Jinming-Hu Sep 6, 2022
7b68b31
Increment version for storage releases (#3924)
azure-sdk Sep 6, 2022
009fe81
Add github actions based check enforcer (#3922)
benbp Sep 7, 2022
deb847e
Add `$schema` to `cgmanifest.json` (#3918)
JamieMagee Sep 13, 2022
3fec13f
Remove SkipDefaultCheckout parameter (#3930)
azure-sdk Sep 14, 2022
0e00a3a
Compatibility improvement for striped blob (#3932)
microzchang Sep 15, 2022
17ca687
add a parameter 'condition' to the test-proxy ci invocations. (#3931)
azure-sdk Sep 15, 2022
a511ef6
storage ad-hoc release (#3934)
Jinming-Hu Sep 16, 2022
9b29538
Increment package version after release of azure-storage-blobs (#3935)
azure-sdk Sep 16, 2022
cb4e723
Merge branch 'main' into larryo/syncmain
LarryOsterman Sep 19, 2022
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
16 changes: 16 additions & 0 deletions .github/workflows/event.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: GitHub Event Handler

on:
check_suite:
types: [completed]
issue_comment:
types: [created]

jobs:
event-handler:
name: Handle ${{ github.event_name }} ${{ github.event.action }} event
runs-on: ubuntu-latest
steps:
- uses: azure/azure-sdk-actions@main
with:
token: ${{ secrets.GITHUB_TOKEN }}
6 changes: 6 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,12 @@
"numofmessages"
]
},
{
"filename": "**/sdk/storage/azure-storage-files-shares/**/*",
"words": [
"mibps"
]
},
{
"filename": "**/cmake-modules/**/*",
"words": [
Expand Down
10 changes: 5 additions & 5 deletions cmake-modules/FolderList.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ macro(GetFolderList project)
DownloadDepVersion(sdk/core azure-core 1.5.0)
DownloadDepVersion(sdk/identity azure-identity 1.1.0)
elseif(${project} STREQUAL STORAGE_COMMON)
DownloadDepVersion(sdk/core azure-core 1.5.0)
DownloadDepVersion(sdk/core azure-core 1.7.1)
elseif(${project} STREQUAL STORAGE_BLOBS)
DownloadDepVersion(sdk/core azure-core 1.5.0)
DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.4)
DownloadDepVersion(sdk/core azure-core 1.7.1)
DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.3.0)
elseif(${project} STREQUAL STORAGE_FILES_DATALAKE)
DownloadDepVersion(sdk/core azure-core 1.3.1)
DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.2)
DownloadDepVersion(sdk/storage/azure-storage-blobs azure-storage-blobs 12.3.0)
elseif(${project} STREQUAL STORAGE_FILES_SHARES)
DownloadDepVersion(sdk/core azure-core 1.3.1)
DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.2)
DownloadDepVersion(sdk/core azure-core 1.7.1)
DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.3.0)
elseif(${project} STREQUAL STORAGE_QUEUES)
DownloadDepVersion(sdk/core azure-core 1.5.0)
DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.3)
Expand Down
58 changes: 49 additions & 9 deletions eng/common/pipelines/templates/jobs/perf.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,31 @@
parameters:
- name: JobName
type: string
default: 'Perf'
- name: LinuxPool
type: string
default: 'azsdk-pool-mms-ubuntu-2004-perf'
- name: LinuxVmImage
type: string
default: 'MMSUbuntu20.04'
- name: WindowsPool
type: string
default: 'azsdk-pool-mms-win-2019-perf'
- name: WindowsVmImage
type: string
default: 'MMS2019'
- name: Language
type: string
default: ''
- name: LanguageRepoName
type: string
default: $(Build.Repository.Name)
- name: LanguageRepoCommitish
type: string
default: $(Build.SourceVersion)
- name: ToolsRepoCommitish
type: string
default: 'main'
- name: Variables
type: object
default: []
Expand Down Expand Up @@ -54,23 +81,36 @@ jobs:
matrix:
${{ if contains(parameters.OperatingSystems, 'Linux') }}:
Linux:
Pool: 'azsdk-pool-mms-ubuntu-2004-perf'
OsVmImage: 'MMSUbuntu20.04'
Pool: ${{ parameters.LinuxPool }}
OsVmImage: ${{ parameters.LinuxVmImage }}
MatrixName: 'Linux'
${{ if contains(parameters.OperatingSystems, 'Windows') }}:
Windows:
Pool: 'azsdk-pool-mms-win-2019-perf'
OsVmImage: 'MMS2019'
Pool: ${{ parameters.WindowsPool }}
OsVmImage: ${{ parameters.WindowsVmImage }}
MatrixName: 'Windows'
variables:
- ${{ parameters.Variables }}
pool:
name: $(Pool)
vmImage: $(OSVmImage)
steps:
- checkout: self
path: s

- checkout: azure-sdk-tools
path: s/azure-sdk-tools
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
parameters:
Paths:
- '/*'
- '!sdk/**/test-recordings/*'
- '!sdk/**/recordings/*'
- '!sdk/**/SessionRecords/*'
- '!sdk/**/session-records/*'
Repositories:
- Name: ${{ parameters.LanguageRepoName }}
Commitish: ${{ parameters.LanguageRepoCommitish }}
WorkingDirectory: $(System.DefaultWorkingDirectory)
- Name: Azure/azure-sdk-tools
Commitish: ${{ parameters.ToolsRepoCommitish }}
WorkingDirectory: $(System.DefaultWorkingDirectory)/azure-sdk-tools

- template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
parameters:
Expand Down Expand Up @@ -133,7 +173,7 @@ jobs:
- task: PublishPipelineArtifact@1
inputs:
targetPath: azure-sdk-tools/tools/perf-automation/Azure.Sdk.Tools.PerfAutomation/results
artifactName: results-$(MatrixName)
artifactName: results-${{ parameters.Language }}-$(MatrixName)
condition: always()

- template: /eng/common/TestResources/remove-test-resources.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ steps:
- ${{ if parameters.SparseCheckoutPaths }}:
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
parameters:
SkipDefaultCheckout: true
SkipCheckoutNone: true
Repositories:
- Name: ${{ parameters.TargetDocRepoOwner }}/${{ parameters.TargetDocRepoName }}
WorkingDirectory: ${{ parameters.WorkingDirectory }}/repo
Expand Down
15 changes: 10 additions & 5 deletions eng/common/pipelines/templates/steps/sparse-checkout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ parameters:
- Name: $(Build.Repository.Name)
Commitish: $(Build.SourceVersion)
WorkingDirectory: $(System.DefaultWorkingDirectory)
- name: SkipDefaultCheckout
- name: SkipCheckoutNone
type: boolean
default: false

steps:
- ${{ if not(parameters.SkipDefaultCheckout) }}:
- checkout: none
- ${{ if not(parameters.SkipCheckoutNone) }}:
- checkout: none

- task: PowerShell@2
displayName: 'Sparse checkout repositories'
Expand All @@ -38,8 +38,13 @@ steps:
} else {
Write-Host "Repository $($repository.Name) is being initialized."

Write-Host "git clone --no-checkout --filter=tree:0 https://github.com/$($repository.Name) ."
git clone --no-checkout --filter=tree:0 https://github.com/$($repository.Name) .
if ($repository.Commitish -match '^refs/pull/\d+/merge$') {
Write-Host "git clone --no-checkout --filter=tree:0 -c remote.origin.fetch='+$($repository.Commitish):refs/remotes/origin/$($repository.Commitish)' https://github.com/$($repository.Name) ."
git clone --no-checkout --filter=tree:0 -c remote.origin.fetch=''+$($repository.Commitish):refs/remotes/origin/$($repository.Commitish)'' https://github.com/$($repository.Name) .
} else {
Write-Host "git clone --no-checkout --filter=tree:0 https://github.com/$($repository.Name) ."
git clone --no-checkout --filter=tree:0 https://github.com/$($repository.Name) .
}

Write-Host "git sparse-checkout init"
git sparse-checkout init
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ parameters:
default: ''
steps:
- ${{ if eq(length(parameters.PackageInfoLocations), 0) }}:
- checkout: none
- pwsh: |
Write-Host "Skipping DocsMS Update because package list was empty."
displayName: Skip DocsMS Update
Expand All @@ -47,7 +46,7 @@ steps:

- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
parameters:
SkipDefaultCheckout: true
SkipCheckoutNone: true
Repositories:
- Name: ${{ parameters.TargetDocRepoOwner }}/${{ parameters.TargetDocRepoName }}
WorkingDirectory: $(DocRepoLocation)
Expand Down Expand Up @@ -77,7 +76,7 @@ steps:
displayName: Checkout daily docs branch if it exists
workingDirectory: $(DocRepoLocation)

# If NOT performing a daily docs build, set the $(TargetBranchName) to the
# If NOT performing a daily docs build, set the $(TargetBranchName) to the
# default branch of the documentation repository.
- ${{ if ne(parameters.DailyDocsBuild, 'true') }}:
- template: /eng/common/pipelines/templates/steps/set-default-branch.yml
Expand All @@ -104,7 +103,7 @@ steps:
-PackageSourceOverride '${{ parameters.PackageSourceOverride }}' `
-TenantId '$(opensource-aad-tenant-id)' `
-ClientId '$(opensource-aad-app-id)' `
-ClientSecret '$(opensource-aad-secret)'
-ClientSecret '$(opensource-aad-secret)'
displayName: Apply Documentation Updates

- template: /eng/common/pipelines/templates/steps/git-push-changes.yml
Expand Down
6 changes: 6 additions & 0 deletions eng/common/testproxy/test-proxy-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,30 @@ parameters:
rootFolder: '$(Build.SourcesDirectory)'
targetVersion: ''
templateRoot: '$(Build.SourcesDirectory)'
condition: true

steps:
- pwsh: |
${{ parameters.templateRoot }}/eng/common/scripts/trust-proxy-certificate.ps1
displayName: 'Language Specific Certificate Trust'
condition: and(succeeded(), ${{ parameters.condition }})

- pwsh: |
docker info
displayName: 'Dump active docker information'
condition: and(succeeded(), ${{ parameters.condition }})

- pwsh: |
${{ parameters.templateRoot }}/eng/common/testproxy/docker-start-proxy.ps1 -Mode start -TargetFolder "${{ parameters.rootFolder }}" -VersionOverride="${{ parameters.targetVersion }}"
displayName: 'Run the docker container'
condition: and(succeeded(), ${{ parameters.condition }})

- pwsh: |
docker container ls -a
displayName: Check running container
condition: and(succeeded(), ${{ parameters.condition }})

- pwsh: |
Write-Host "##vso[task.setvariable variable=PROXY_MANUAL_START]true"
displayName: 'Set PROXY_MANUAL_START'
condition: and(succeeded(), ${{ parameters.condition }})
10 changes: 7 additions & 3 deletions eng/common/testproxy/test-proxy-tool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ parameters:
runProxy: true
targetVersion: ''
templateRoot: '$(Build.SourcesDirectory)'
condition: true

steps:
- pwsh: |
${{ parameters.templateRoot }}/eng/common/scripts/trust-proxy-certificate.ps1
displayName: 'Language Specific Certificate Trust'
condition: and(succeeded(), ${{ parameters.condition }})

- pwsh: |
$version = $(Get-Content "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt" -Raw).Trim()
Expand All @@ -23,6 +25,7 @@ steps:
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json `
--version $version
displayName: "Install test-proxy"
condition: and(succeeded(), ${{ parameters.condition }})

- pwsh: |
Write-Host "##vso[task.prependpath]$(Build.BinariesDirectory)/test-proxy"
Expand All @@ -34,19 +37,20 @@ steps:
Write-Host "##vso[task.setvariable variable=ASPNETCORE_Kestrel__Certificates__Default__Password]password"
Write-Host "##vso[task.setvariable variable=PROXY_MANUAL_START]true"
displayName: 'Configure Kestrel and PROXY_MANUAL_START Variables'
condition: and(succeeded(), ${{ parameters.condition }})

- pwsh: |
Start-Process $(Build.BinariesDirectory)/test-proxy/test-proxy.exe `
-ArgumentList "--storage-location ${{ parameters.rootFolder }}" `
-NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.templateRoot }}/test-proxy.log
displayName: 'Run the testproxy - windows'
condition: and(succeeded(), eq(variables['Agent.OS'],'Windows_NT'))
condition: and(succeeded(), eq(variables['Agent.OS'],'Windows_NT'), ${{ parameters.condition }})

# nohup does NOT continue beyond the current session if you use it within powershell
- bash: |
nohup $(Build.BinariesDirectory)/test-proxy/test-proxy > ${{ parameters.templateRoot }}/test-proxy.log &
displayName: "Run the testproxy - linux/mac"
condition: and(succeeded(), ne(variables['Agent.OS'],'Windows_NT'))
condition: and(succeeded(), ne(variables['Agent.OS'],'Windows_NT'), ${{ parameters.condition }})
workingDirectory: "${{ parameters.rootFolder }}"

- pwsh: |
Expand All @@ -62,4 +66,4 @@ steps:
Write-Error "Could not connect to test proxy."
exit 1
displayName: Test Proxy IsAlive

condition: and(succeeded(), ${{ parameters.condition }})
40 changes: 20 additions & 20 deletions eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"matrix": {
"CmakeEnvArg": "",
"OSConfig": {
"Linux": {
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
"OSVmImage": "MMSUbuntu18.04",
"AptDependencies": "libcurl4-openssl-dev",
"VCPKG_DEFAULT_TRIPLET": "x64-linux"
},
"Windows": {
"Pool": "azsdk-pool-mms-win-2019-general",
"OSVmImage": "MMS2019",
"VCPKG_DEFAULT_TRIPLET": "x64-windows"
},
"Mac": {
"Pool": "Azure Pipelines",
"OSVmImage": "macos-11",
"VCPKG_DEFAULT_TRIPLET": "x64-osx"
}
}
"matrix": {
"CmakeEnvArg": "",
"OSConfig": {
"Linux": {
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
"OSVmImage": "MMSUbuntu18.04",
"AptDependencies": "libcurl4-openssl-dev",
"VCPKG_DEFAULT_TRIPLET": "x64-linux"
},
"Windows": {
"Pool": "azsdk-pool-mms-win-2019-general",
"OSVmImage": "MMS2019",
"VCPKG_DEFAULT_TRIPLET": "x64-windows"
},
"Mac": {
"Pool": "Azure Pipelines",
"OSVmImage": "macos-11",
"VCPKG_DEFAULT_TRIPLET": "x64-osx"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"matrix": {
"OSConfig": {
"Windows": {
"Pool": "azsdk-pool-mms-win-2019-general",
"OSVmImage": "MMS2019",
"CmakeEnvArg": ""
},
"Linux": {
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
"OSVmImage": "MMSUbuntu18.04",
"CmakeEnvArg": "",
"AptDependencies": "libcurl4-openssl-dev"
},
"Mac": {
"Pool": "Azure Pipelines",
"OSVmImage": "macos-11",
"CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ",
"BrewDependencies": "openssl"
}
}
"matrix": {
"OSConfig": {
"Windows": {
"Pool": "azsdk-pool-mms-win-2019-general",
"OSVmImage": "MMS2019",
"CmakeEnvArg": ""
},
"Linux": {
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
"OSVmImage": "MMSUbuntu18.04",
"CmakeEnvArg": "",
"AptDependencies": "libcurl4-openssl-dev"
},
"Mac": {
"Pool": "Azure Pipelines",
"OSVmImage": "macos-11",
"CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ",
"BrewDependencies": "openssl"
}
}
}
}
Loading