|
23 | 23 | "v2.28.0-fixes", |
24 | 24 | "v2.27.0-fixes" |
25 | 25 | ], |
26 | | - "branch_strategy": "Fix in main → auto-propagates to stable → rhoai (every 2 hours). Manual cherry-pick to release branches during code freeze.", |
| 26 | + "branch_strategy": "Fix in main \u2192 auto-propagates to stable \u2192 rhoai (every 2 hours). Manual cherry-pick to release branches during code freeze.", |
27 | 27 | "cve_fix_workflow": { |
28 | 28 | "primary_target": "main", |
29 | 29 | "backport_targets": "Active vX.X.X-fixes branches for released versions", |
30 | | - "automation": "Auto-sync every 2 hours (main → stable → rhoai)", |
| 30 | + "automation": "Auto-sync every 2 hours (main \u2192 stable \u2192 rhoai)", |
31 | 31 | "manual_intervention": "Cherry-pick during code freeze or for patch releases" |
32 | 32 | }, |
33 | 33 | "repository_type": "monorepo", |
|
49 | 49 | "opendatahub-io/models-as-a-service": { |
50 | 50 | "github_url": "https://github.com/opendatahub-io/models-as-a-service", |
51 | 51 | "default_branch": "main", |
52 | | - "protected_branches": [], |
53 | | - "active_release_branches": [], |
54 | | - "branch_strategy": "TBD - needs investigation", |
| 52 | + "active_release_branches": [ |
| 53 | + "stable", |
| 54 | + "rhoai", |
| 55 | + "v0.1.x" |
| 56 | + ], |
| 57 | + "branch_strategy": "Fix in main \u2192 auto-propagates to stable \u2192 rhoai. Release branches follow pattern v0.X.x.", |
| 58 | + "repo_type": "upstream", |
| 59 | + "subcomponent": "maas-api", |
55 | 60 | "cve_fix_workflow": { |
56 | 61 | "primary_target": "main", |
57 | | - "backport_targets": "TBD", |
58 | | - "automation": "Unknown", |
59 | | - "manual_intervention": "Unknown" |
60 | | - }, |
61 | | - "build_location": "maas-api/", |
62 | | - "notes": "Upstream repository. Contains maas-api Go application. Builds using Dockerfile.konflux for Red Hat builds.", |
63 | | - "repo_type": "upstream" |
| 62 | + "backport_targets": "stable, rhoai, v0.1.x" |
| 63 | + } |
64 | 64 | }, |
65 | 65 | "red-hat-data-services/models-as-a-service": { |
66 | 66 | "github_url": "https://github.com/red-hat-data-services/models-as-a-service", |
67 | | - "default_branch": "rhoai-3.0", |
68 | | - "protected_branches": [], |
| 67 | + "default_branch": "main", |
69 | 68 | "active_release_branches": [ |
70 | | - "rhoai-3.0" |
| 69 | + "rhoai-3.3", |
| 70 | + "rhoai-3.4", |
| 71 | + "rhoai-3.4-ea.1", |
| 72 | + "rhoai-3.4-ea.2" |
71 | 73 | ], |
72 | | - "branch_strategy": "TBD - needs investigation", |
| 74 | + "branch_strategy": "Fork of upstream. RHOAI release branches follow pattern rhoai-X.Y.", |
| 75 | + "repo_type": "downstream", |
| 76 | + "subcomponent": "maas-api", |
73 | 77 | "cve_fix_workflow": { |
74 | | - "primary_target": "rhoai-3.0", |
75 | | - "backport_targets": "rhoai-3.0", |
76 | | - "automation": "Manual backport from upstream", |
77 | | - "manual_intervention": "Cherry-pick or re-apply fixes from upstream repo" |
78 | | - }, |
79 | | - "build_location": "maas-api/", |
80 | | - "notes": "Downstream Red Hat release repository for maas-api. Fixes from upstream should be backported to rhoai-3.0 branch.", |
81 | | - "repo_type": "downstream" |
| 78 | + "primary_target": "main", |
| 79 | + "backport_targets": "rhoai-3.3, rhoai-3.4, rhoai-3.4-ea.1, rhoai-3.4-ea.2" |
| 80 | + } |
| 81 | + }, |
| 82 | + "opendatahub-io/opendatahub-operator": { |
| 83 | + "github_url": "https://github.com/opendatahub-io/opendatahub-operator", |
| 84 | + "default_branch": "main", |
| 85 | + "active_release_branches": [ |
| 86 | + "odh-3.4.0-ea.1", |
| 87 | + "odh-3.4.0-ea.2" |
| 88 | + ], |
| 89 | + "branch_strategy": "Fix in main. ODH release branches follow pattern odh-X.Y.Z. Also syncs to stable and rhoai branches.", |
| 90 | + "repo_type": "upstream", |
| 91 | + "subcomponent": "operator", |
| 92 | + "notes": "No Dockerfile.konflux RHOAI container label found \u2014 uses rhoai.Dockerfile variant. Container name TBD.", |
| 93 | + "cve_fix_workflow": { |
| 94 | + "primary_target": "main", |
| 95 | + "backport_targets": "odh-3.4.0-ea.1, odh-3.4.0-ea.2" |
| 96 | + } |
| 97 | + }, |
| 98 | + "red-hat-data-services/opendatahub-operator": { |
| 99 | + "github_url": "https://github.com/red-hat-data-services/opendatahub-operator", |
| 100 | + "default_branch": "main", |
| 101 | + "active_release_branches": [], |
| 102 | + "branch_strategy": "Fork of upstream opendatahub-io/opendatahub-operator. No RHOAI release branches yet \u2014 only main/master.", |
| 103 | + "repo_type": "downstream", |
| 104 | + "subcomponent": "operator", |
| 105 | + "cve_fix_workflow": { |
| 106 | + "primary_target": "main", |
| 107 | + "backport_targets": "None" |
| 108 | + } |
82 | 109 | } |
83 | 110 | } |
84 | 111 | }, |
|
0 commit comments