From 19ae71ea3fd5285bbdba487d879d0acd022e196c Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 23 Mar 2021 21:50:54 +0100 Subject: [PATCH] Add Linux acceptance tests - Trial 12 --- build/azure-pipelines.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 94d0418c6d..971edab89b 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -222,7 +222,7 @@ stages: displayName: Use .Net Core sdk 5.x inputs: version: 5.x - - powershell: sqlcmd -S . -U sa -P UmbracoIntegration123! -Q="CREATE DATABASE $env:UmbracoDatabaseName" + - powershell: sqlcmd -S . -U sa -P $env:SA_PASSWORD -Q="CREATE DATABASE $env:UmbracoDatabaseName" displayName: Create database # - task: DotNetCoreCLI@2 # displayName: dotnet build (Netcore) @@ -236,34 +236,34 @@ stages: - task: Npm@1 displayName: npm install (Client) inputs: - workingDir: src\Umbraco.Web.UI.Client + workingDir: src/Umbraco.Web.UI.Client verbose: false - task: gulp@0 displayName: gulp build inputs: - gulpFile: src\Umbraco.Web.UI.Client\gulpfile.js + gulpFile: src/Umbraco.Web.UI.Client/gulpfile.js targets: build - workingDirectory: src\Umbraco.Web.UI.Client - - powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src\Umbraco.Web.UI.Netcore\Umbraco.Web.UI.Netcore.csproj" + workingDirectory: src/Umbraco.Web.UI.Client + - powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src/Umbraco.Web.UI.Netcore/Umbraco.Web.UI.Netcore.csproj" displayName: dotnet run (Netcore) - # - powershell: dotnet run --no-build -p .\src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj + # - powershell: dotnet run --no-build -p ./src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj # displayName: dotnet run (Netcore) - task: PowerShell@1 displayName: Generate Cypress.env.json inputs: scriptType: inlineScript inlineScript: > - @{ username = $env:Umbraco__CMS__Unattended__UnattendedUserEmail; password = $env:Umbraco__CMS__Unattended__UnattendedUserPassword } | ConvertTo-Json | Set-Content -Path "src\Umbraco.Tests.AcceptanceTest\cypress.env.json" + @{ username = $env:Umbraco__CMS__Unattended__UnattendedUserEmail; password = $env:Umbraco__CMS__Unattended__UnattendedUserPassword } | ConvertTo-Json | Set-Content -Path "src/Umbraco.Tests.AcceptanceTest/cypress.env.json" - task: Npm@1 name: PrepareTask displayName: npm install (AcceptanceTest) inputs: - workingDir: 'src\Umbraco.Tests.AcceptanceTest' + workingDir: 'src/Umbraco.Tests.AcceptanceTest' - task: Npm@1 displayName: Run Cypress (Desktop) condition: always() inputs: - workingDir: src\Umbraco.Tests.AcceptanceTest + workingDir: src/Umbraco.Tests.AcceptanceTest command: 'custom' customCommand: 'run test -- --reporter junit --reporter-options "mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos,videoUploadOnPasses=false"' @@ -278,7 +278,7 @@ stages: # displayName: Run Cypress (Tablet portrait) # condition: always() # inputs: - # workingDir: src\Umbraco.Tests.AcceptanceTest + # workingDir: src/Umbraco.Tests.AcceptanceTest # command: 'custom' # customCommand: 'run test -- --config="viewportHeight=1366,viewportWidth=1024,screenshotsFolder=cypress/artifacts/tablet/screenshots,videosFolder=cypress/artifacts/tablet/videos,videoUploadOnPasses=false"' # @@ -286,7 +286,7 @@ stages: # displayName: Run Cypress (Mobile protrait) # condition: always() # inputs: - # workingDir: src\Umbraco.Tests.AcceptanceTest + # workingDir: src/Umbraco.Tests.AcceptanceTest # command: 'custom' # customCommand: 'run test -- --config="viewportHeight=812,viewportWidth=375,screenshotsFolder=cypress/artifacts/mobile/screenshots,videosFolder=cypress/artifacts/mobile/videos,videoUploadOnPasses=false"' - task: PublishPipelineArtifact@1