Skip to content

Commit 4843c46

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #1034 from TransactionProcessing/task/upgrade_eventstore_version
update linux eventstore and try run all tests on windows with no spec…
2 parents c29276c + b594187 commit 4843c46

File tree

2 files changed

+69
-62
lines changed

2 files changed

+69
-62
lines changed

‎.github/workflows/pullrequest.yml‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -54,55 +54,55 @@ jobs:
5454
name: tracelogslinux
5555
path: /home/txnproc/trace/
5656

57-
# buildwindows:
58-
# name: "Build and Test Pull Requests - Windows"
59-
# env:
60-
# ASPNETCORE_ENVIRONMENT: "Production"
57+
buildwindows:
58+
name: "Build and Test Pull Requests - Windows"
59+
env:
60+
ASPNETCORE_ENVIRONMENT: "Production"
61+
62+
runs-on: windows-latest
63+
64+
steps:
65+
- uses: actions/checkout@v1
66+
67+
- name: Install NET 9
68+
uses: actions/setup-dotnet@v4.0.1
69+
with:
70+
dotnet-version: '9.0.x'
71+
72+
- name: Build Windows SQL Server
73+
run: |
74+
cd SQLDocker
75+
docker build -t mssqlserver:2022-ltsc2022 --build-arg SQL_VERSION=2022 --build-arg WIN_VERSION=ltsc2022 .
76+
77+
- name: Restore Nuget Packages
78+
run: dotnet restore Shared.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
79+
80+
- name: Build Code
81+
run: dotnet build Shared.sln --configuration Release
82+
83+
- name: Run Unit Tests
84+
run: |
85+
echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}"
86+
dotnet test "Shared.Tests\Shared.Tests.csproj"
87+
88+
- name: Run Event Store Tests
89+
run: |
90+
echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}"
91+
dotnet test "Shared.EventStore.Tests\Shared.EventStore.Tests.csproj"
92+
dotnet test "Shared.EventStoreContext.Tests\Shared.EventStoreContext.Tests.csproj"
93+
94+
- name: Run Integration Tests
95+
env:
96+
IsCI: true
97+
run: |
98+
echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}"
99+
dotnet test "Shared.IntegrationTesting.Tests\Shared.IntegrationTesting.Tests.csproj"
61100
62-
# runs-on: windows-latest
63-
64-
# steps:
65-
# - uses: actions/checkout@v1
66-
67-
# - name: Install NET 9
68-
# uses: actions/setup-dotnet@v4.0.1
69-
# with:
70-
# dotnet-version: '9.0.x'
71-
72-
# - name: Build Windows SQL Server
73-
# run: |
74-
# cd SQLDocker
75-
# docker build -t mssqlserver:2022-ltsc2022 --build-arg SQL_VERSION=2022 --build-arg WIN_VERSION=ltsc2022 .
76-
77-
# - name: Restore Nuget Packages
78-
# run: dotnet restore Shared.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
79-
80-
# - name: Build Code
81-
# run: dotnet build Shared.sln --configuration Release
82-
83-
# - name: Run Unit Tests
84-
# run: |
85-
# echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}"
86-
# dotnet test "Shared.Tests\Shared.Tests.csproj"
87-
88-
# - name: Run Event Store Tests
89-
# run: |
90-
# echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}"
91-
# dotnet test "Shared.EventStore.Tests\Shared.EventStore.Tests.csproj"
92-
# dotnet test "Shared.EventStoreContext.Tests\Shared.EventStoreContext.Tests.csproj"
93-
94-
# - name: Run Integration Tests
95-
# env:
96-
# IsCI: true
97-
# run: |
98-
# echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}"
99-
# dotnet test "Shared.IntegrationTesting.Tests\Shared.IntegrationTesting.Tests.csproj"
100-
101-
# - uses: actions/upload-artifact@v4.4.3
102-
# #if: ${{ failure() }}
103-
# with:
104-
# name: tracelogswindows
105-
# path: C:\\Users\\runneradmin\\txnproc
101+
- uses: actions/upload-artifact@v4.4.3
102+
#if: ${{ failure() }}
103+
with:
104+
name: tracelogswindows
105+
path: C:\\Users\\runneradmin\\txnproc
106106

107107
# buildmacos:
108108
# name: "Build and Test Pull Requests - Mac"

‎Shared.IntegrationTesting/BaseDockerHelper.cs‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,10 @@ protected BaseDockerHelper(Boolean skipHealthChecks=false) {
136136

137137
// Setup the default image details
138138
SimpleResults.Result<DockerEnginePlatform> engineType = BaseDockerHelper.GetDockerEnginePlatform();
139-
if (engineType.Data == DockerEnginePlatform.Windows){
139+
if (engineType.Data == DockerEnginePlatform.Windows)
140+
{
140141
this.ImageDetails.Add(ContainerType.SqlServer, ("iamrjindal/sqlserverexpress:2022", true));
141-
this.ImageDetails.Add(ContainerType.EventStore, ("stuartferguson/eventstore_windows", true));
142+
this.ImageDetails.Add(ContainerType.EventStore, ("stuartferguson/kurrentdb_windows", true));
142143
this.ImageDetails.Add(ContainerType.MessagingService, ("stuartferguson/messagingservicewindows:master", true));
143144
this.ImageDetails.Add(ContainerType.SecurityService, ("stuartferguson/securityservicewindows:master", true));
144145
this.ImageDetails.Add(ContainerType.CallbackHandler, ("stuartferguson/callbackhandlerwindows:master", true));
@@ -147,9 +148,10 @@ protected BaseDockerHelper(Boolean skipHealthChecks=false) {
147148
this.ImageDetails.Add(ContainerType.FileProcessor, ("stuartferguson/fileprocessorwindows:master", true));
148149
this.ImageDetails.Add(ContainerType.TransactionProcessorAcl, ("stuartferguson/transactionprocessoraclwindows:master", true));
149150
}
150-
else{
151+
else
152+
{
151153
this.ImageDetails.Add(ContainerType.SqlServer, ("mcr.microsoft.com/mssql/server:2022-latest", true));
152-
this.ImageDetails.Add(ContainerType.EventStore, ("eventstore/eventstore:24.10.0-jammy", true));
154+
this.ImageDetails.Add(ContainerType.EventStore, ("kurrentplatform/kurrentdb:25.1", true));
153155
this.ImageDetails.Add(ContainerType.MessagingService, ("stuartferguson/messagingservice:master", true));
154156
this.ImageDetails.Add(ContainerType.SecurityService, ("stuartferguson/securityservice:master", true));
155157
this.ImageDetails.Add(ContainerType.CallbackHandler, ("stuartferguson/callbackhandler:master", true));
@@ -547,28 +549,33 @@ public virtual INetworkService SetupTestNetwork(String networkName = null,
547549
Boolean reuseIfExists = false){
548550
networkName = String.IsNullOrEmpty(networkName) ? $"testnw{this.TestId:N}" : networkName;
549551
SimpleResults.Result<DockerEnginePlatform> engineType = BaseDockerHelper.GetDockerEnginePlatform();
552+
Console.WriteLine($"Engine Type is {engineType.Data}");
550553

551-
if (engineType.Data == DockerEnginePlatform.Windows){
554+
if (engineType.Data == DockerEnginePlatform.Windows)
555+
{
552556
var docker = BaseDockerHelper.GetDockerHost();
553557
var network = docker.GetNetworks().SingleOrDefault(nw => nw.Name == networkName);
554-
if (network == null){
558+
if (network == null)
559+
{
555560
Dictionary<String, String> driverOptions = new Dictionary<String, String>();
556561
driverOptions.Add("com.docker.network.windowsshim.networkname", networkName);
557562

558563
network = docker.CreateNetwork(networkName,
559-
new NetworkCreateParams{
560-
Driver = "nat",
561-
DriverOptions = driverOptions,
562-
Attachable = true,
563-
});
564+
new NetworkCreateParams
565+
{
566+
Driver = "nat",
567+
DriverOptions = driverOptions,
568+
Attachable = true,
569+
});
564570
}
565571

566572
return network;
567573
}
568574

569-
if (engineType.Data == DockerEnginePlatform.Linux){
570-
// Build a network
571-
NetworkBuilder networkService = new Builder().UseNetwork(networkName).ReuseIfExist();
575+
if (engineType.Data == DockerEnginePlatform.Linux)
576+
{
577+
// Build a network
578+
NetworkBuilder networkService = new Builder().UseNetwork(networkName).ReuseIfExist();
572579

573580
return networkService.Build();
574581
}

0 commit comments

Comments
 (0)