bug: Fix osmodifier version used in cicd pipeline #196
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR fixes the OS modifier version configuration in the CI/CD pipeline to ensure functional tests use the correct build type instead of always defaulting to the preview version.
- Adds a new
osModifierBuildTypeparameter with configurable options (dev/preview) - Updates the e2e template to explicitly use the "dev" build type
- Passes the build type parameter through to the OS modifier download template
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
.pipelines/templates/stages/testing_functional/functional-testing.yml |
Adds osModifierBuildType parameter with dev/preview options and passes it to download template |
.pipelines/templates/e2e-template.yml |
Sets osModifierBuildType to "dev" for functional testing stage |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
| - template: stages/testing_functional/functional-testing.yml | ||
| parameters: | ||
| downloadPrebuiltImage: false | ||
| osModifierBuildType: "dev" |
There was a problem hiding this comment.
wont this force a rebuild always even on our ci piepline?
There was a problem hiding this comment.
Looks like yes. And since we use the same check elsewhere, I think the selection logic is broken there too
There was a problem hiding this comment.
i haven't dug in at all, but it seems to work:
-
pr-e2e uses pinned version always: https://dev.azure.com/mariner-org/2311650c-e79e-4301-b4d2-96543fdd84ff/_apis/build/builds/939215/logs/1
-
prism cicd builds from main always: https://dev.azure.com/mariner-org/2311650c-e79e-4301-b4d2-96543fdd84ff/_apis/build/builds/939218/logs/1
There was a problem hiding this comment.
The problem is that trident-ci builds from main: https://dev.azure.com/mariner-org/ECF/_build/results?buildId=939067&view=logs&j=89be317f-4095-56c0-24ea-e29ca6e966ca&t=fd6cb343-1797-57f4-fed5-61492b920c1f
Previously the FTs would always use the preview version of OS modifier.
Pipeline run: https://dev.azure.com/mariner-org/ECF/_build/results?buildId=939170&view=logs&j=4ce13d6b-835b-52c0-999f-6017e90e79af&t=4f2af3c0-7754-5a00-265b-43b22938f2d4