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.

Sign up for GitHub

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

Updated azure spring data cosmos group id and artifact id #12925

Merged
merged 6 commits into from
Jul 9, 2020
Merged

Updated azure spring data cosmos group id and artifact id #12925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f95e39
Updated azure spring data cosmos group id and artifact id
kushagraThapar Jul 8, 2020
189829a
Sorted version client to alphabetical list
kushagraThapar Jul 8, 2020
98e37a5
Merged latest master and resolved conflicts
kushagraThapar Jul 8, 2020
aade973
Fixed tests.yml with new safename for azure spring data cosmos
kushagraThapar Jul 8, 2020
6f26e04
Increasing timeout for cosmos emulator builds since download step tak…
kushagraThapar Jul 9, 2020
d5552e8
Added comments for increasing the timeout value
kushagraThapar Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eng/jacoco-test-coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,9 @@
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-data-gremlin-spring-boot-starter;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>spring-data-cosmosdb</artifactId>
<version>3.0.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-data-cosmosdb;current} -->
<groupId>com.azure</groupId>
<artifactId>azure-spring-data-cosmos</artifactId>
<version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
</dependency>
</dependencies>
<build>
Expand Down
3 changes: 3 additions & 0 deletions eng/pipelines/templates/stages/cosmos-sdk-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ stages:
ServiceDirectory: cosmos
Artifacts: ${{ parameters.Artifacts }}
AdditionalModules: ${{ parameters.AdditionalModules }}
# Increased timeout to 90 because of cosmos emulator taking 25-30 mins to download emulator
# Issue filed to improve download speed: https://github.com/Azure/azure-sdk-for-java/issues/12970
TimeoutInMinutes: 90
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please include a comment explaining that the timeout is extended because the Cosmos Emulator takes a very long time to download and link this bug: #12970

A glance through download times for Cosmos DB in Python and JS hosts shows that the download step is taking a very long time compared to Java. It's not clear why this is the case. The bug above is tracking this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for creating the issue @danieljurek
I have added the comment in this PR .

Matrix:
Tcp_Integration_Tests_Java8:
OSVmImage: 'windows-2019'
Expand Down
2 changes: 1 addition & 1 deletion eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ com.azure:azure-security-keyvault-certificates;4.0.4;4.1.0-beta.4
com.azure:azure-security-keyvault-keys;4.1.4;4.2.0-beta.5
com.azure:azure-security-keyvault-secrets;4.1.4;4.2.0-beta.4
com.azure:azure-sdk-template;1.0.4-beta.19;1.0.4-beta.20
com.azure:azure-spring-data-cosmos;3.0.0-beta.1;3.0.0-beta.1
com.azure:azure-storage-blob;12.8.0-beta.1;12.8.0-beta.2
com.azure:azure-storage-blob-batch;12.6.0-beta.1;12.6.0-beta.2
com.azure:azure-storage-blob-changefeed;12.0.0-beta.1;12.0.0-beta.2
Expand All @@ -60,7 +61,6 @@ com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-spring-boot-metrics-starter;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-spring-boot-tests;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-spring-boot-test-core;2.3.2;2.3.3-beta.1
com.microsoft.azure:spring-data-cosmosdb;3.0.0-beta.1;3.0.0-beta.1

# Unreleased dependencies: Copy the entry from above, prepend "unreleased_" and remove the current
# version. Unreleased dependencies are only valid for dependency versions.
Expand Down
6 changes: 3 additions & 3 deletions sdk/cosmos/azure-spring-data-cosmos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
</parent>

<groupId>com.microsoft.azure</groupId>
<artifactId>spring-data-cosmosdb</artifactId>
<version>3.0.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:spring-data-cosmosdb;current} -->
<groupId>com.azure</groupId>
<artifactId>azure-spring-data-cosmos</artifactId>
<version>3.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
<packaging>jar</packaging>
<name>Spring Data for Azure Cosmos DB SQL API</name>
<description>Spring Data for Azure Cosmos DB SQL API</description>
Expand Down
4 changes: 2 additions & 2 deletions sdk/cosmos/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ extends:
- name: azure-cosmos
groupId: com.azure
safeName: azurecosmos
- name: spring-data-cosmosdb
groupId: com.microsoft.azure
- name: azure-spring-data-cosmos
groupId: com.azure
safeName: azurespringdatacosmos
AdditionalModules:
- name: azure-cosmos-benchmark
Expand Down
6 changes: 3 additions & 3 deletions sdk/cosmos/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,9 @@ jobs:
TestName: Integration_Test_Spring_Data_Cosmosdb
ServiceDirectory: cosmos
Artifacts:
- name: spring-data-cosmosdb
groupId: com.microsoft.azure
safeName: springdatacosmosdb
- name: azure-spring-data-cosmos
groupId: com.azure
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the artifact changing the safe name would be azurespringdatacosmos. The ci.yml apparently already has this change.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yups, done.

safeName: azurespringdatacosmos
TimeoutInMinutes: 90
Matrix:
Session_Integration:
Expand Down