use pom.service.xml instead of pom.xml (#4562)

* use pom.service.xml instead of pom.xml * update keyvault to use migrated pom
Azure · Jul 25, 2019 · ec4b55c · ec4b55c
1 parent 38be797
commit ec4b55c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
@@ -12,7 +12,7 @@ jobs:
       - task: Maven@3
         displayName: 'Run Live tests'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.xml
+          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
           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'

diff --git a/sdk/keyvault/tests.yml b/sdk/keyvault/tests.yml
@@ -1,11 +1,9 @@
 trigger: none
 
 jobs:
-    # When migrating change path to ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
-  - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests-pre-sdk.yml
+  - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
     parameters:
-      # When migrating use ServiceDirectory
-      PomFilePath: './keyvault/data-plane/pom.xml'
+      ServiceDirectory: keyvault
       EnvVars:
         AZURE_TEST_MODE: RECORD
         ARM_CLIENTID: $(java-keyvault-test-arm-client-id)