Skip to content

Commit

Permalink
Merge changes from master into azconfig (#3055)
Browse files Browse the repository at this point in the history
* Standardize indention and publishing (#2974)

* SpotBug P3 Fixes (#2973)

* Adding suppression for having named static inner classes from anonymous.

* Add suppression for redundant null check.

* Move SIC_INNER_SHOULD_BE_STATIC suppression

* Make anonymous class in CachingKeyResolver a named inner static.

* Include missing impl classes for auto-rest when it generates a variable with known null value

* Suppressing unconfirmed casts because we know the cast is correct but the APIs weren't designed for it

* Bumping up resource-manager parent and eventgrid.v2019_01_01 to version 1.0.0 (#2975)

* Bumping up resource-manager parent pom to 1.0.0

* Bumping up eventgrid.v2019_01_01 to version 1.0.0

* [AutoPR privatedns/resource-manager] Add private dns module name for java codegen (#3009)

* Generated from e92e525831933bedf2242fe607984757387be1b2

Add private dns module name for java codegen

* Update pom for private dns

* change private dns version back to beta

* SpotBug P3 fixes (#2976)

* Suppress using Nullable parameter as non-null for KeyVaultKey because it was a scenario in original SDK not thought of.

* Suppress return empty array rather than null

* Add null check for service to ensure it has been initialized

* Checking for null service value before invoking method

* Catching specific exceptions rather than Exception e

* Use 8L so that the integer multiplication is not implicitly cast to long.

* Add exclude for catch Exception in CachingKeyResolver

* Catching specific exceptions rather than Exception e

* Update YAML formatting (#3033)

- Update whitespace to match Prettier formatting
- Add .prettierrc.yml
- Part of Azure/azure-sdk#225

* adding impression pixel (#3024)

license/cla override. Check isn't coming back for some reason.

* Add .editorconfig and .gitattributes (#3036)

* Adding .editorconfig

* Add .gitattributes

* Reformat pom.client.xml

* Reformat keyvault/data-plane/pom.xml

* Reformat batch/data-plane/pom.xml

* Enable Checkstyle fail on error / violation for Key Vault (#2969)

* Now that KeyVault data-plane has no more checkstyle errors or violations, we are now enforcing build failure for this project and all child modules.

* Install build tools locally so that checkstyle can run.

* Fix whitespace

* It is not necessary to run checkstyle:check as the build will fail satisfactorily under the analyze job.

* Format pom.client.xml to 2 spaces.

* Record playback integration (#2870)

Record/Playback Integration in Azure Batch Java SDK tests. 
Added Test recordings to be used in playback mode.

* Normalising lines (#3050)
  • Loading branch information
conniey authored Mar 7, 2019
1 parent 198837f commit 1525dc7
Show file tree
Hide file tree
Showing 402 changed files with 106,894 additions and 90,879 deletions.
1 change: 1 addition & 0 deletions .azure-pipelines/.prettierrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
singleQuote: true
72 changes: 36 additions & 36 deletions .azure-pipelines/client.test.live.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
jobs:
- job: 'LiveTest'
- job: 'LiveTest'

strategy:
matrix:
AzureBatch:
pomFilePath: './batch/data-plane/pom.xml'
AzureKeyVault:
pomFilePath: './keyvault/data-plane/pom.xml'
strategy:
matrix:
AzureBatch:
pomFilePath: './batch/data-plane/pom.xml'
AzureKeyVault:
pomFilePath: './keyvault/data-plane/pom.xml'

pool:
vmImage: 'vs2017-win2016'
pool:
vmImage: 'vs2017-win2016'

steps:
# Adding -Dmaven.wagon.http.pool=false to the mvn command as a workaround to prevent build failures at maven artifacts downloading stage.
- task: Maven@3
displayName: 'Run Live tests'
inputs:
mavenPomFile: $(pomFilePath)
options: '--batch-mode -Dmaven.wagon.http.pool=false -Dsurefire.rerunFailingTestsCount=3'
mavenOptions: '-Xmx3072m -Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.8'
jdkArchitectureOption: 'x64'
publishJUnitResults: false
goals: 'test'
env:
ARM_CLIENTID: $(java-keyvault-test-arm-client-id)
ARM_CLIENTKEY: $(java-keyvault-test-arm-client-key)
AZURE_TEST_MODE: RECORD
AZURE_BATCH_ACCOUNT: $(java-batch-test-account-name)
AZURE_BATCH_ACCESS_KEY: $(java-batch-test-account-access-key)
STORAGE_ACCOUNT_KEY: $(java-batch-test-storage-account-key)
STORAGE_ACCOUNT_NAME: $(java-batch-test-storage-account-name)
AZURE_BATCH_ENDPOINT: https://servbatch.centralus.batch.azure.com
steps:
# Adding -Dmaven.wagon.http.pool=false to the mvn command as a workaround to prevent build failures at maven artifacts downloading stage.
- task: Maven@3
displayName: 'Run Live tests'
inputs:
mavenPomFile: $(pomFilePath)
options: '--batch-mode -Dmaven.wagon.http.pool=false -Dsurefire.rerunFailingTestsCount=3'
mavenOptions: '-Xmx3072m -Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.8'
jdkArchitectureOption: 'x64'
publishJUnitResults: false
goals: 'test'
env:
ARM_CLIENTID: $(java-keyvault-test-arm-client-id)
ARM_CLIENTKEY: $(java-keyvault-test-arm-client-key)
AZURE_TEST_MODE: RECORD
AZURE_BATCH_ACCOUNT: $(java-batch-test-account-name)
AZURE_BATCH_ACCESS_KEY: $(java-batch-test-account-access-key)
STORAGE_ACCOUNT_KEY: $(java-batch-test-storage-account-key)
STORAGE_ACCOUNT_NAME: $(java-batch-test-storage-account-name)
AZURE_BATCH_ENDPOINT: https://servbatch.centralus.batch.azure.com

- task: PublishTestResults@2
condition: succeededOrFailed()
inputs:
mergeTestResults: true
testRunTitle: 'Live tests for $(pomFilePath)'
- task: PublishTestResults@2
condition: succeededOrFailed()
inputs:
mergeTestResults: true
testRunTitle: 'Live tests for $(pomFilePath)'
Loading

0 comments on commit 1525dc7

Please sign in to comment.