Skip to content
Draft
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions eng/pipelines/pr-validation-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ jobs:
exit 1
}
displayName: 'Download and restore AdventureWorks2022 database'
condition: or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025'))
condition: and(succeeded(), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
env:
DB_PASSWORD: $(DB_PASSWORD)

Expand All @@ -307,7 +307,7 @@ jobs:
artifact: 'perf-baseline-$(sqlVersion)'
path: $(Build.SourcesDirectory)
displayName: 'Download baseline from main'
condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/main'), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/main'), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
continueOnError: true

# Rename downloaded baseline so the script finds it (artifact may be in a subfolder)
Expand All @@ -320,7 +320,7 @@ jobs:
Write-Host "No baseline file downloaded (first run or artifact missing)"
}
displayName: 'Prepare baseline file'
condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/main'), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/main'), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
continueOnError: true

# Run performance benchmarks on SQL Server 2022
Expand Down Expand Up @@ -412,7 +412,7 @@ jobs:
Write-Host "`nRunning performance benchmarks..."
python benchmarks/perf-benchmarking.py --baseline benchmark_baseline.json --json benchmark_results.json
displayName: 'Run performance benchmarks on SQL Server 2022/2025'
condition: or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025'))
condition: and(succeeded(), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
continueOnError: true
env:
DB_CONNECTION_STRING: 'Server=localhost;Database=AdventureWorks2022;Uid=sa;Pwd=$(DB_PASSWORD);TrustServerCertificate=yes'
Expand Down Expand Up @@ -672,7 +672,7 @@ jobs:
rm -f /tmp/AdventureWorks2022.bak
docker exec sqlserver rm -f /tmp/AdventureWorks2022.bak || true
displayName: 'Download and restore AdventureWorks2022 database on macOS'
condition: or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025'))
condition: and(succeeded(), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
continueOnError: true
env:
DB_PASSWORD: $(DB_PASSWORD)
Expand All @@ -688,7 +688,7 @@ jobs:
artifact: 'perf-baseline-macOS-$(sqlVersion)'
path: $(Build.SourcesDirectory)
displayName: 'Download macOS baseline from main'
condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/main'), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/main'), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
continueOnError: true

- script: |
Expand All @@ -700,7 +700,7 @@ jobs:
echo "No baseline file downloaded (first run or artifact missing)"
fi
displayName: 'Prepare macOS baseline file'
condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/main'), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/main'), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
continueOnError: true

# Run performance benchmarks on macOS
Expand All @@ -714,7 +714,7 @@ jobs:
echo "Running performance benchmarks..."
python benchmarks/perf-benchmarking.py --baseline benchmark_baseline.json --json benchmark_results.json
displayName: 'Run performance benchmarks on macOS $(sqlVersion)'
condition: or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025'))
condition: and(succeeded(), or(eq(variables['sqlVersion'], 'SQL2022'), eq(variables['sqlVersion'], 'SQL2025')))
timeoutInMinutes: 20
continueOnError: true
env:
Expand Down
Loading