[patch] Version-specific Monitor FVT suite execution for 9.1 and 9.2+#2227
Open
jvaneel-dwivedi wants to merge 8 commits intomasterfrom
Open
[patch] Version-specific Monitor FVT suite execution for 9.1 and 9.2+#2227jvaneel-dwivedi wants to merge 8 commits intomasterfrom
jvaneel-dwivedi wants to merge 8 commits intomasterfrom
Conversation
added 2 commits
April 28, 2026 19:44
- Update fvt-monitor.yml to use 'fvt_9x' instead of 'fvt_91x' - Update phase1.yml.j2 to run fvt-monitor-only for all modern suites - Update mas-fvt-monitor.yml.j2 parameter descriptions and comments - Ensures File Ingest tests run before IoT for Monitor >= 9.2
…9.2+ - Monitor 9.1: Runs fvt_9x, fvt_mref, fvt_scada in Phase 2 (no Phase 1) - Monitor 9.2+: Runs fvt_monitor_only in Phase 1, ALL 5 suites in Phase 2 - Legacy versions (8.x/9.0): Unchanged, runs monitor_fvt_with_manage only Changes: - fvt-monitor.yml: Set fvt_91x for 9.1, fvt_9x for 9.2+ - phase1.yml.j2: Exclude fvt_91x from Phase 1 execution - phase2.yml.j2: Add fvt_9x to all suite conditions, fvt_91x to 3 suites - mas-fvt-monitor.yml.j2: Update parameter description
…se 1/Phase 2 model - Updated phase1.yml.j2: Added fvt-monitor-only task for file ingest before IoT - Updated phase2.yml.j2: Added 5 parallel tasks (fvt-9x, fvt-mref, fvt-iot, fvt-scada, fvt-mist) after IoT - Updated mas-fvt-launcher.yml.j2: Integrated Phase 1 and Phase 2 task definitions - Monitor 9.1: Runs fvt_91x suite - Monitor 9.2+: Runs fvt_9x suite with all Phase 2 tasks in parallel - All Phase 2 tasks depend on waitfor-iot-after-monitor completion
- Removed when clause from taskref.yml.j2 to prevent duplication - Added validation checks directly to phase1.yml.j2 and phase2.yml.j2 - Ensures fvt_digest_monitor and mas_app_channel_monitor are validated - Fixes BadRequest error during pipeline apply
- Added fvt_digest_monitor parameter for Monitor FVT image digest - Added mas_app_channel_monitor parameter for Monitor app channel version - Added mas_workspace_id parameter for MAS workspace ID - Added fvt_test_suite parameter to specify which test suite to run These parameters are required by the new Phase 1 (fvt-monitor-only) and Phase 2 (fvt-9x, fvt-mref, fvt-iot, fvt-scada, fvt-mist) Monitor FVT tasks. Fixes Tekton validation error: non-existent variable in pipeline parameters
The phase1 and phase2 templates should ONLY be included in mas-fvt-launcher pipeline, not in mas-fvt-monitor pipeline. The mas-fvt-monitor pipeline is a standalone pipeline that runs a single FVT test suite based on the fvt_test_suite parameter. It should not contain the phased execution logic with IoT dependencies. Fixes: - Removed phase1.yml.j2 and phase2.yml.j2 template includes - Fixed data-dictionary task dependency from 'fvt-9x' to 'fvt-monitor-with-manage' - Removed incorrect references to launchfvt_monitor and mas_monitor_install_order parameters - Removed dependency on non-existent waitfor-iot-after-monitor task This resolves Tekton validation errors: - 'task fvt-9x depends on waitfor-iot-after-monitor but waitfor-iot-after-monitor wasn't present' - 'non-existent variable in $(params.launchfvt_monitor)' - 'non-existent variable in $(params.mas_monitor_install_order)'
- Fixed regression where fvt-monitor-only was not running after Monitor installation - Restored launchfvt-monitor-before-iot task in FVT launcher pipeline - Removed broken inline phase tasks and unnecessary parameters from FVT launcher - Implemented phase-based execution in mas-fvt-monitor pipeline: * Phase 1: fvt-monitor-only runs immediately after Monitor installation * Wait task: Waits for IoT installation to complete * Phase 2: 5 suites run in parallel (fvt-9x, fvt-mref, fvt-iot, fvt-scada, fvt-mist) - Created pipeline-phase1.yml.j2 and pipeline-phase2.yml.j2 task definitions - Follows same pattern as Manage FVT but adapted for Monitor's pre/post IoT requirements This ensures Monitor FVT tests execute correctly: 1. Monitor installation completes 2. fvt-monitor-only suite runs (File Ingest tests) 3. Pipeline waits for IoT installation 4. All remaining suites execute in parallel
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.