Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java
Browse files Browse the repository at this point in the history
…into normalize_package_name
  • Loading branch information
sima-zhu committed Feb 2, 2021
2 parents ca9b4a2 + 6b2269a commit e4319b2
Show file tree
Hide file tree
Showing 2,508 changed files with 764,404 additions and 540,499 deletions.
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
###########

# Catch all
/sdk/ @joshfree @srnagar @hemanttanwar @anuchandy @conniey @jianghaolu @bsiegel
/sdk/ @joshfree @srnagar @hemanttanwar @anuchandy @conniey @jianghaolu

# BOM
# PRLabel: %Azure.Core
Expand Down Expand Up @@ -81,7 +81,7 @@
/sdk/storage/ @amishra-dev @rickle-msft @jaschrep-msft @gapra-msft @alzimmermsft @kasobol-msft

# PRLabel: %Tables
/sdk/tables/ @bsiegel @conniey
/sdk/tables/ @vcolin7 @conniey

# PRLabel: %EngSys
/sdk/template/ @Azure/azure-sdk-eng
Expand Down Expand Up @@ -114,7 +114,7 @@
/eng/jacoco-test-coverage/ @srnagar @JonathanGiles
/eng/spotbugs-aggregate-report/ @srnagar @JonathanGiles
/eng/mgmt/ @JimSuplizio @mitchdenny @weshaggard @danieljurek @ChenTanyi @weidongxu-microsoft @yungezz @xccc-msft
/eng/versioning/ @JimSuplizio @mitchdenny @danieljurek @alzimmermsft @samvaity
/eng/versioning/ @JimSuplizio @mitchdenny @danieljurek @alzimmermsft @samvaity @g2vinay
/parent/ @JimSuplizio @alzimmermsft

/**/tests.yml @danieljurek
Expand Down
96 changes: 96 additions & 0 deletions common/smoke-tests/smoke-test-dependencies.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
jobs:
- template: ./smoke-test-job.yml
parameters:
TestTask:
task: Maven@3
displayName: 'Run Smoke Tests'
inputs:
mavenPomFile: $(PomFile)
goals: 'exec:java'
options: '$(DefaultOptions) -Dexec.mainClass="com.azure.smoketest.App"'
javaHomeOption: 'JDKVersion'
jdkVersionOption: $(JavaTestVersion)
jdkArchitectureOption: 'x64'
publishJUnitResults: false
env:
AZURE_LOG_LEVEL: 2

Matrix:
Java 8 Windows (AzureCloud):
JavaTestVersion: '1.8'
OSVmImage: windows-2019
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ArmTemplateParameters: $(azureCloudArmParameters)
PomFile: common/smoke-tests/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
Java LTS Windows (AzureCloud):
JavaTestVersion: '1.11'
OSVmImage: windows-2019
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ArmTemplateParameters: $(azureCloudArmParameters)
PomFile: common/smoke-tests/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
Java 8 Linux (AzureCloud):
JavaTestVersion: '1.8'
OSVmImage: ubuntu-18.04
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ArmTemplateParameters: $(azureCloudArmParameters)
PomFile: common/smoke-tests/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
Java LTS Linux (AzureCloud):
JavaTestVersion: '1.11'
OSVmImage: ubuntu-18.04
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ArmTemplateParameters: $(azureCloudArmParameters)
PomFile: common/smoke-tests/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
Java LTS Linux (AzureCloud Canary):
JavaTestVersion: '1.11'
OSVmImage: ubuntu-18.04
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
ArmTemplateParameters: $(azureCloudArmParameters)
Location: 'eastus2euap'
PomFile: common/smoke-tests/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
Java 8 MacOS (AzureCloud):
JavaTestVersion: '1.8'
OSVmImage: macOS-10.15
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ArmTemplateParameters: $(azureCloudArmParameters)
PomFile: common/smoke-tests/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
Java LTS MacOS (AzureCloud):
JavaTestVersion: '1.11'
OSVmImage: macOS-10.15
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ArmTemplateParameters: $(azureCloudArmParameters)
PomFile: common/smoke-tests/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
Java 8 Windows (AzureUSGovernment):
JavaTestVersion: '1.8'
OSVmImage: windows-2019
SubscriptionConfiguration: $(sub-config-gov-test-resources)
ArmTemplateParameters: $(azureUSGovernmentArmParameters)
PomFile: common/smoke-tests/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
Java LTS Windows (AzureUSGovernment):
JavaTestVersion: '1.11'
OSVmImage: windows-2019
SubscriptionConfiguration: $(sub-config-gov-test-resources)
ArmTemplateParameters: $(azureUSGovernmentArmParameters)
PomFile: common/smoke-tests/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
Java 8 Windows (AzureChinaCloud):
JavaTestVersion: '1.8'
OSVmImage: windows-2019
SubscriptionConfiguration: $(sub-config-cn-test-resources)
ArmTemplateParameters: $(azureChinaCloudArmParameters)
PomFile: common/smoke-tests/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
Java LTS Windows (AzureChinaCloud):
JavaTestVersion: '1.11'
OSVmImage: windows-2019
SubscriptionConfiguration: $(sub-config-cn-test-resources)
ArmTemplateParameters: $(azureChinaCloudArmParameters)
PomFile: common/smoke-tests/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
91 changes: 91 additions & 0 deletions common/smoke-tests/smoke-test-job.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
parameters:
- name: Matrix
type: object
- name: TestTask
type: object
- name: MaxParallel
type: number
default: 0
- name: Timeout
type: number
default: 15


jobs:
- job: SmokeTest
timeoutInMinutes: ${{ parameters.Timeout }}

strategy:
maxParallel: ${{ parameters.MaxParallel }}
matrix: ${{ parameters.Matrix }}

pool:
vmImage: $(OSVmImage)

variables:
azureCloudArmParameters: "@{ storageEndpointSuffix = 'core.windows.net'; azureCloud = 'AzureCloud'; }"
azureUSGovernmentArmParameters: "@{ storageEndpointSuffix = 'core.usgovcloudapi.net'; azureCloud = 'AzureUSGovernment'; }"
azureChinaCloudArmParameters: "@{ storageEndpointSuffix = 'core.chinacloudapi.cn'; azureCloud = 'AzureChinaCloud'; }"


steps:
- task: Maven@3
displayName: Use the latest package version from the dev feed
inputs:
mavenPomFile: $(PomFile)
goals: 'versions:use-latest-versions'
options: '$(DefaultOptions) --no-transfer-progress -DskipTests "-Dincludes=com.azure:*"'
javaHomeOption: 'JDKVersion'
jdkVersionOption: $(JavaTestVersion)
jdkArchitectureOption: 'x64'
publishJUnitResults: false

- task: UsePythonVersion@0
displayName: 'Use Python 3.6'
inputs:
versionSpec: '3.6'

- task: PythonScript@0
inputs:
scriptPath: common/smoke-tests/validate_version_dates.py
workingDirectory: common/smoke-tests
continueOnError: true
displayName: Validate consistent dependency dev versions for com.azure packages

- pwsh: Get-Content $(PomFile)
displayName: Show pom.xml

- task: Maven@3
displayName: Show dependency tree
inputs:
mavenPomFile: $(PomFile)
goals: 'dependency:tree'
options: '$(DefaultOptions) --no-transfer-progress -DskipTests'
javaHomeOption: 'JDKVersion'
jdkVersionOption: $(JavaTestVersion)
jdkArchitectureOption: 'x64'
publishJUnitResults: false

- task: Maven@3
displayName: 'Build and Package'
inputs:
mavenPomFile: $(PomFile)
goals: 'package'
options: '$(DefaultOptions) --no-transfer-progress -DskipTests'
javaHomeOption: 'JDKVersion'
jdkVersionOption: $(JavaTestVersion)
jdkArchitectureOption: 'x64'
publishJUnitResults: false

- template: /eng/common/TestResources/deploy-test-resources.yml
parameters:
ServiceDirectory: $(ServiceDirectory)
ArmTemplateParameters: $(ArmTemplateParameters)
SubscriptionConfiguration: $(SubscriptionConfiguration)

- ${{ parameters.TestTask }}

- template: /eng/common/TestResources/remove-test-resources.yml
parameters:
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
SubscriptionConfiguration: $(SubscriptionConfiguration)
28 changes: 28 additions & 0 deletions common/smoke-tests/smoke-test-samples.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
jobs:
- template: ./smoke-test-job.yml
parameters:
Timeout: 30
MaxParallel: 2

TestTask:
task: Maven@3
displayName: 'Run Smoke Test Samples'
inputs:
mavenPomFile: $(PomFile)
goals: 'test'
options: '$(DefaultOptions) -Dtest=**/*Example.java,**/*Sample.java'
javaHomeOption: 'JDKVersion'
jdkVersionOption: $(JavaTestVersion)
jdkArchitectureOption: 'x64'
publishJUnitResults: false
env:
AZURE_LOG_LEVEL: 2

Matrix:
Service Bus:
JavaTestVersion: '1.8'
OSVmImage: windows-2019
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ArmTemplateParameters: $(azureCloudArmParameters)
PomFile: sdk/servicebus/azure-messaging-servicebus/pom.xml
ServiceDirectory: '$(Build.SourcesDirectory)/sdk/servicebus/'
Loading

0 comments on commit e4319b2

Please sign in to comment.