Fixes for live tests after POM restructure (#9221)

Added artifact lists to live test runs so that they trigger correctly.
AzureSDKAutomation · Mar 19, 2020 · da6b989 · da6b989
1 parent 9699a74
commit da6b989
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 21 deletions.
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
@@ -38,7 +38,7 @@ parameters:
   TestName: LiveTest
   TimeoutInMinutes: 60
   TestStepMavenInputs:
-    options: '-Dmaven.wagon.http.pool=false $(DefaultOptions)'
+    options: '-Dmaven.wagon.http.pool=false $(DefaultOptions) -pl $(ProjectList)'
     mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
     javaHomeOption: 'JDKVersion'
     jdkVersionOption: '$(JavaVersion)'
@@ -89,10 +89,27 @@ jobs:
 
       - ${{ parameters.PreRunSteps }}
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+
+      - task: Maven@3
+        displayName: 'Build and Install'
+        inputs:
+          mavenPomFile: pom.xml
+          goals: 'install'
+          options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am'
+          mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
+          javaHomeOption: 'JDKVersion'
+          jdkVersionOption: '1.11'
+          jdkArchitectureOption: 'x64'
+          publishJUnitResults: false
+
+
       - task: Maven@3
         displayName: $(DisplayName)
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.xml
+          mavenPomFile: pom.xml
           ${{ insert }}: ${{ parameters.TestStepMavenInputs }}
         env: ${{ parameters.EnvVars }}
 

diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -8,8 +8,8 @@ stages:
     - template: ../jobs/archetype-sdk-client.yml
       parameters:
         ServiceDirectory: ${{parameters.ServiceDirectory}}
+        Artifacts: ${{ parameters.Artifacts }}
         SDKType: ${{parameters.SDKType}}
-        Artifacts: ${{parameters.Artifacts}}
         TestMatrix:
           Linux - Java 8:
             OSName: 'Linux'
@@ -62,6 +62,7 @@ stages:
         TestName: Emulator
         DisableAzureResourceCreation: true
         ServiceDirectory: cosmos
+        Artifacts: ${{ parameters.Artifacts }}
         Matrix:
           Tcp_Integration_Tests_Java8:
             OSVmImage: 'windows-2019'

diff --git a/pom.xml b/pom.xml
@@ -8,6 +8,7 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
+    <module>eng/code-quality-reports</module>
     <module>sdk/appconfiguration</module>
     <module>sdk/authorization</module>
     <module>sdk/batch</module>
@@ -24,5 +25,6 @@
     <module>sdk/search</module>
     <module>sdk/servicebus</module>
     <module>sdk/storage</module>
+    <module>sdk/textanalytics</module>
   </modules>
 </project>
diff --git a/sdk/appconfiguration/tests.yml b/sdk/appconfiguration/tests.yml
@@ -4,6 +4,10 @@ jobs:
   - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
     parameters:
       ServiceDirectory: appconfiguration
+      Artifacts:
+        - name: azure-data-appconfiguration
+          groupId: com.azure
+          safeName: azuredataappconfiguration
       EnvVars:
         AZURE_TEST_MODE: RECORD
         AZURE_TEST_HTTP_CLIENTS: ALL

diff --git a/sdk/batch/tests.yml b/sdk/batch/tests.yml
@@ -4,6 +4,10 @@ jobs:
   - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
     parameters:
       ServiceDirectory: batch
+      Artifacts:
+        - name: azure-batch
+          groupId: com.microsoft.azure
+          safeName: azurebatch
       EnvVars:
         AZURE_TEST_MODE: RECORD # RECORD mode hits live services
         AZURE_BATCH_ACCOUNT: $(java-batch-test-account-name)

diff --git a/sdk/cosmos/tests.yml b/sdk/cosmos/tests.yml
@@ -10,6 +10,10 @@ jobs:
     parameters:
       TestName: Single_Region_Session
       ServiceDirectory: cosmos
+      Artifacts:
+        - name: azure-cosmos
+          groupId: com.azure
+          safeName: azurecosmos
       TimeoutInMinutes: 240
       EnvVars:
         ACCOUNT_HOST: $(java-cosmos-session-singleregion-host)
@@ -70,6 +74,10 @@ jobs:
     parameters:
       TestName: Single_Region_Session_2
       ServiceDirectory: cosmos
+      Artifacts:
+        - name: azure-cosmos
+          groupId: com.azure
+          safeName: azurecosmos
       TimeoutInMinutes: 240
       EnvVars:
         ACCOUNT_HOST: $(java-cosmos-session-singleregion-one-host)
@@ -129,6 +137,10 @@ jobs:
     parameters:
       TestName: Single_Region_Strong_Tcp
       ServiceDirectory: cosmos
+      Artifacts:
+        - name: azure-cosmos
+          groupId: com.azure
+          safeName: azurecosmos
       TimeoutInMinutes: 240
       EnvVars:
         ACCOUNT_HOST: $(java-cosmos-strong-singleregion-host)
@@ -197,6 +209,10 @@ jobs:
     parameters:
       TestName: Single_Region_Strong_Https
       ServiceDirectory: cosmos
+      Artifacts:
+        - name: azure-cosmos
+          groupId: com.azure
+          safeName: azurecosmos
       TimeoutInMinutes: 240
       EnvVars:
         ACCOUNT_HOST: $(java-cosmos-strong-singleregion-host)
@@ -291,6 +307,10 @@ jobs:
     parameters:
       TestName: MultiMaster_Multi_Region
       ServiceDirectory: cosmos
+      Artifacts:
+        - name: azure-cosmos
+          groupId: com.azure
+          safeName: azurecosmos
       TimeoutInMinutes: 240
       EnvVars:
         ACCOUNT_HOST: $(java-cosmos-multimaster-multiregion-host)
@@ -347,6 +367,10 @@ jobs:
     parameters:
       TestName: MultiMaster_Single_Region
       ServiceDirectory: cosmos
+      Artifacts:
+        - name: azure-cosmos
+          groupId: com.azure
+          safeName: azurecosmos
       TimeoutInMinutes: 240
       EnvVars:
         ACCOUNT_HOST: $(java-cosmos-multimaster-singleregion-host)

diff --git a/sdk/eventhubs/tests.yml b/sdk/eventhubs/tests.yml
@@ -4,6 +4,13 @@ jobs:
   - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
     parameters:
       ServiceDirectory: eventhubs
+      Artifacts:
+        - name: azure-messaging-eventhubs
+          groupId: com.azure
+          safeName: azuremessagingeventhubs
+        - name: azure-messaging-eventhubs-checkpointstore-blob
+          groupId: com.azure
+          safeName: azuremessagingeventhubscheckpointstoreblob
       TimeoutInMinutes: 120
       EnvVars:
         AZURE_TEST_MODE: RECORD

diff --git a/sdk/keyvault/tests.yml b/sdk/keyvault/tests.yml
@@ -6,6 +6,16 @@ jobs:
       TimeoutInMinutes: 240
       MaxParallel: 3
       ServiceDirectory: keyvault
+      Artifacts:
+        - name: azure-security-keyvault-certificates
+          groupId: com.azure
+          safeName: azuresecuritykeyvaultcertificates
+        - name: azure-security-keyvault-keys
+          groupId: com.azure
+          safeName: azuresecuritykeyvaultkeys
+        - name: azure-security-keyvault-secrets
+          groupId: com.azure
+          safeName: azuresecuritykeyvaultsecrets
       EnvVars:
         AZURE_TEST_MODE: RECORD
         AZURE_TEST_HTTP_CLIENTS: ALL

diff --git a/sdk/search/tests.yml b/sdk/search/tests.yml
@@ -14,3 +14,7 @@ jobs:
         AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
         AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
         AZURE_SUBSCRIPTION_ID: $(aad-azure-sdk-test-subscription-id)
+      Artifacts:
+        - name: azure-search
+          groupId: com.azure
+          safeName: azuresearch
diff --git a/sdk/servicebus/tests.yml b/sdk/servicebus/tests.yml
@@ -4,6 +4,10 @@ jobs:
   - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
     parameters:
       ServiceDirectory: servicebus
+      Artifacts:
+        - name: azure-messaging-servicebus
+          groupId: com.azure
+          safeName: azuremessagingservicebus
       EnvVars:
         AZURE_TEST_MODE: RECORD
         AZURE_SERVICEBUS_CONNECTION_STRING: $(java-servicebus-test-connection-string)
diff --git a/sdk/storage/tests.yml b/sdk/storage/tests.yml
@@ -4,6 +4,31 @@ jobs:
   - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
     parameters:
       ServiceDirectory: storage
+      Artifacts:
+        - name: azure-storage-common
+          groupId: com.azure
+          safeName: azurestoragecommon
+        - name: azure-storage-blob
+          groupId: com.azure
+          safeName: azurestorageblob
+        - name: azure-storage-blob-batch
+          groupId: com.azure
+          safeName: azurestorageblobbatch
+        - name: azure-storage-blob-cryptography
+          groupId: com.azure
+          safeName: azurestorageblobcryptography
+        - name: azure-storage-blob-nio
+          groupId: com.azure
+          safeName: azurestorageblobnio
+        - name: azure-storage-file-share
+          groupId: com.azure
+          safeName: azurestoragefileshare
+        - name: azure-storage-file-datalake
+          groupId: com.azure
+          safeName: azurestoragefiledatalake
+        - name: azure-storage-queue
+          groupId: com.azure
+          safeName: azurestoragequeue
       TimeoutInMinutes: 120
       EnvVars:
         AZURE_TEST_MODE: LIVE

diff --git a/sdk/textanalytics/pom.service.xml → sdk/textanalytics/pom.xml b/sdk/textanalytics/pom.service.xml → sdk/textanalytics/pom.xml
@@ -7,22 +7,7 @@
   <artifactId>azure-textanalytics-service</artifactId>
   <packaging>pom</packaging>
   <version>1.0.0</version>  <!-- Need not change for every release-->
-  <profiles>
-    <profile>
-      <id>client</id>
-      <activation>
-        <property>
-          <name>env.SDKTYPE</name>
-          <value>!data</value>
-        </property>
-      </activation>
-      <modules>
-        <module>../core/azure-core</module>
-        <module>../core/azure-core-test</module>
-        <module>../core/azure-core-http-netty</module>
-        <module>../identity/azure-identity</module>
-        <module>azure-ai-textanalytics</module>
-      </modules>
-    </profile>
-  </profiles>
+  <modules>
+    <module>azure-ai-textanalytics</module>
+  </modules>
 </project>
diff --git a/sdk/textanalytics/tests.yml b/sdk/textanalytics/tests.yml
@@ -4,5 +4,9 @@ jobs:
   - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
     parameters:
       ServiceDirectory: textanalytics
+      Artifacts:
+        - name: azure-ai-textanalytics
+          groupId: com.azure
+          safeName: azureaitextanalytics
       EnvVars:
         AZURE_TEST_MODE: RECORD