Skip to content

Commit

Permalink
Chore - separate Docker integration tests Azure resources (arcus-azur…
Browse files Browse the repository at this point in the history
…e#125)

* Chore - separate Docker integration tests Azure resources

* pr-fix: use correct Docker connection string in integration tests

* pr-sug: move non-Docker ServiceBus connection strings to 'SelfContained' sub-category
stijnmoreels authored Oct 12, 2020
1 parent 032e2f3 commit f919d8b
Showing 5 changed files with 18 additions and 12 deletions.
6 changes: 3 additions & 3 deletions build/ci-build.yml
Original file line number Diff line number Diff line change
@@ -112,15 +112,15 @@ stages:
imageName: '$(Images.ServiceBus.Queue)'
imageTag: $(Build.BuildId)
healthPort: $(Arcus.Health.Port.Queue)
connectionString: '$(Arcus.ServiceBus.ConnectionStringWithQueue)'
connectionString: '$(Arcus.ServiceBus.Docker.ConnectionStringWithQueue)'
- template: templates/build-and-run-worker-container.yml
parameters:
projectName: 'Arcus.Messaging.Tests.Workers.ServiceBus.Topic'
containerName: '$(Images.ServiceBus.Topic)'
imageName: '$(Images.ServiceBus.Topic)'
imageTag: $(Build.BuildId)
healthPort: $(Arcus.Health.Port.Topic)
connectionString: '$(Arcus.ServiceBus.ConnectionStringWithTopic)'
connectionString: '$(Arcus.ServiceBus.Docker.ConnectionStringWithTopic)'
- template: test/run-integration-tests.yml@templates
parameters:
dotnetSdkVersion: '$(DotNet.Sdk.Version)'
@@ -135,7 +135,7 @@ stages:

- stage: SelfContainingIntegrationTests
displayName: Self-Containing Integration Tests
dependsOn: DockerIntegrationTests
dependsOn: Build
condition: succeeded()
variables:
- name: 'Arcus.Health.Port.Queue'
6 changes: 3 additions & 3 deletions build/nuget-release.yml
Original file line number Diff line number Diff line change
@@ -97,15 +97,15 @@ stages:
imageName: '$(Images.ServiceBus.Queue)'
imageTag: $(Build.BuildId)
healthPort: $(Arcus.Health.Port.Queue)
connectionString: '$(Arcus.ServiceBus.ConnectionStringWithQueue)'
connectionString: '$(Arcus.ServiceBus.Docker.ConnectionStringWithQueue)'
- template: templates/build-and-run-worker-container.yml
parameters:
projectName: 'Arcus.Messaging.Tests.Workers.ServiceBus.Topic'
containerName: '$(Images.ServiceBus.Topic)'
imageName: '$(Images.ServiceBus.Topic)'
imageTag: $(Build.BuildId)
healthPort: $(Arcus.Health.Port.Topic)
connectionString: '$(Arcus.ServiceBus.ConnectionStringWithTopic)'
connectionString: '$(Arcus.ServiceBus.Docker.ConnectionStringWithTopic)'
- template: test/run-integration-tests.yml@templates
parameters:
dotnetSdkVersion: '$(DotNet.Sdk.Version)'
@@ -120,7 +120,7 @@ stages:

- stage: SelfContainingIntegrationTests
displayName: Self-Containing Integration Tests
dependsOn: DockerIntegrationTests
dependsOn: Build
condition: succeeded()
variables:
- name: 'Arcus.Health.Port.Queue'
4 changes: 2 additions & 2 deletions src/Arcus.Messaging.Tests.Integration/Fixture/TestConfig.cs
Original file line number Diff line number Diff line change
@@ -71,8 +71,8 @@ public string GetServiceBusConnectionString(ServiceBusEntity entity)
{
switch (entity)
{
case ServiceBusEntity.Queue: return _config["Arcus:ServiceBus:ConnectionStringWithQueue"];
case ServiceBusEntity.Topic: return _config["Arcus:ServiceBus:ConnectionStringWithTopic"];
case ServiceBusEntity.Queue: return _config["Arcus:ServiceBus:SelfContained:ConnectionStringWithQueue"];
case ServiceBusEntity.Topic: return _config["Arcus:ServiceBus:SelfContained:ConnectionStringWithTopic"];
default:
throw new ArgumentOutOfRangeException(nameof(entity), entity, "Unknown Service Bus entity");
}
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@ namespace Arcus.Messaging.Tests.Integration.MessagePump
[Trait("Category", "Docker")]
public class ServiceBusMessagePumpDockerTests : IntegrationTest, IAsyncLifetime
{
private const string QueueConnectionStringKey = "Arcus:ServiceBus:ConnectionStringWithQueue";
private const string TopicConnectionStringKey = "Arcus:ServiceBus:ConnectionStringWithTopic";
private const string QueueConnectionStringKey = "Arcus:ServiceBus:Docker:ConnectionStringWithQueue";
private const string TopicConnectionStringKey = "Arcus:ServiceBus:Docker:ConnectionStringWithTopic";

public static IEnumerable<object[]> Encodings
{
10 changes: 8 additions & 2 deletions src/Arcus.Messaging.Tests.Integration/appsettings.json
Original file line number Diff line number Diff line change
@@ -15,8 +15,14 @@
}
},
"ServiceBus": {
"ConnectionStringWithQueue": "#{Arcus.ServiceBus.ConnectionStringWithQueue}#",
"ConnectionStringWithTopic": "#{Arcus.ServiceBus.ConnectionStringWithTopic}#"
"Docker": {
"ConnectionStringWithQueue": "#{Arcus.ServiceBus.Docker.ConnectionStringWithQueue}#",
"ConnectionStringWithTopic": "#{Arcus.ServiceBus.Docker.ConnectionStringWithTopic}#"
},
"SelfContained": {
"ConnectionStringWithQueue": "#{Arcus.ServiceBus.ConnectionStringWithQueue}#",
"ConnectionStringWithTopic": "#{Arcus.ServiceBus.ConnectionStringWithTopic}#"
}
},
"KeyRotation": {
"ServicePrincipal": {

0 comments on commit f919d8b

Please sign in to comment.