Skip to content

Commit 4836328

Browse files
ci: [NGOv1.X]Updated Wrench and added project dependency (#3513)
This PR is a port of #3512 This PR bumps Wrench to the latest version and regnerates recipes (I will close automated update PRs after). This update allows us to modify timeouts and add additional project dependencies for the validation jobs so I added **testproject** validation as dependency for our releases (I didn't add minimalproject since there are no tests and testproject-tools-integration since this will be moved to Tools repo). Beside adding testproject as the default project for running EditMode and PlayMode tests I also permanently bumped validation job timeout to 40m (option available from this Wrench version) since in the past we needed to bump it manually from 20m since sometimes our jobs were timing up I tested the change and now we are running all package and project tests correctly when releasing with Wrench scripts ## Backport #3512
1 parent 283493e commit 4836328

File tree

9 files changed

+242
-232
lines changed

9 files changed

+242
-232
lines changed

.yamato/wrench/api-validation-jobs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
2020
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
2121
timeout: 20
2222
retries: 10
23-
- command: unity-downloader-cli -u 2021.3/staging -c Editor --fast
23+
- command: unity-downloader-cli -u 2021.3/staging -c editor --path .Editor --fast
2424
timeout: 10
2525
retries: 3
2626
- command: python PythonScripts/PackageJsonCondersor.py
@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
5151
dependencies:
5252
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
5353
variables:
54-
UPMPVP_CONTEXT_WRENCH: 0.11.3.0
54+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.11.3.0
57+
Wrench: 0.12.1.0
5858

.yamato/wrench/package-pack-jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 0.11.3.0
27+
Wrench: 0.12.1.0
2828

.yamato/wrench/preview-a-p-v.yml

Lines changed: 55 additions & 55 deletions
Large diffs are not rendered by default.

.yamato/wrench/promotion-jobs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ publish_dry_run_netcode_gameobjects:
208208
ignore_artifact: true
209209
variables:
210210
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
211-
UPMPVP_CONTEXT_WRENCH: 0.11.3.0
211+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
212212
metadata:
213213
Job Maintainers: '#rm-packageworks'
214-
Wrench: 0.11.3.0
214+
Wrench: 0.12.1.0
215215

216216
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
217217
publish_netcode_gameobjects:
@@ -420,8 +420,8 @@ publish_netcode_gameobjects:
420420
ignore_artifact: true
421421
variables:
422422
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
423-
UPMPVP_CONTEXT_WRENCH: 0.11.3.0
423+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
424424
metadata:
425425
Job Maintainers: '#rm-packageworks'
426-
Wrench: 0.11.3.0
426+
Wrench: 0.12.1.0
427427

.yamato/wrench/recipe-regeneration.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ test_-_wrench_jobs_up_to_date:
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
12-
- command: dotnet run --project Tools\CI\NGO.Cookbook.csproj
12+
- command: dotnet run --project Tools/CI/NGO.Cookbook.csproj
1313
- command: |-
1414
if [ -n "$(git status --porcelain -- .yamato/wrench)" ]; then
1515
git status
1616
echo "Your repo is not clean - diff output:"
1717
git diff
1818
echo "You must run recipe generation after updating recipes to update the generated YAML!"
19-
echo "Run 'dotnet run --project Tools\CI\NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
19+
echo "Run 'dotnet run --project Tools/CI/NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
2020
exit 1
2121
fi
2222
variables:
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
2626
cancel_old_ci: true
2727
metadata:
2828
Job Maintainers: '#rm-packageworks'
29-
Wrench: 0.11.3.0
29+
Wrench: 0.12.1.0
3030

.yamato/wrench/validation-jobs.yml

Lines changed: 162 additions & 162 deletions
Large diffs are not rendered by default.

.yamato/wrench/wrench_config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
3333
"branch_pattern": "ReleaseSlash",
34-
"wrench_version": "0.11.3.0",
34+
"wrench_version": "0.12.1.0",
3535
"pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
36-
"cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj"
36+
"cs_project_path": "Tools/CI/NGO.Cookbook.csproj"
3737
}

Tools/CI/NGO.Cookbook.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.11.3" />
11+
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.12.1" />
1212
</ItemGroup>
1313

1414
</Project>

Tools/CI/Settings/NGOSettings.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,22 @@ public class NGOSettings : AnnotatedSettingsBase
99
// Path from the root of the repository where packages are located.
1010
readonly string[] packagesRootPaths = {"."};
1111

12+
static ValidationOptions validationOptions = new ValidationOptions()
13+
{
14+
ProjectPath = "testproject",
15+
UtrTestingYamatoTimeout = 40
16+
};
17+
1218
// update this to list all packages in this repo that you want to release.
1319
Dictionary<string, PackageOptions> PackageOptions = new()
1420
{
1521
{
1622
"com.unity.netcode.gameobjects",
17-
new PackageOptions() { ReleaseOptions = new ReleaseOptions() { IsReleasing = true } }
23+
new PackageOptions()
24+
{
25+
ReleaseOptions = new ReleaseOptions() { IsReleasing = true },
26+
ValidationOptions = validationOptions
27+
}
1828
}
1929
};
2030

0 commit comments

Comments
 (0)