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

Merge changes from master into azconfig #3055

Merged
merged 14 commits into from
Mar 7, 2019
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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