Skip to content

Commit 5ede32f

Browse files
vmrh21claude
vmrh21
and
claude
committed
fix: address CodeRabbit review comments and add AI Evaluations repos
- Fix cve.find mapping file path: replace unreliable dirname "$0" with cwd-relative path and repo-root fallback - Add cve_fix_workflow field to all new llm-d and AI Evaluations repos - Add full AI Evaluations component repos (trustyai-service-operator, lm-evaluation-harness, llama-stack-provider-trustyai-garak, eval-hub upstream/midstream/downstream with real branch data) - Add container_to_repo_mapping for odh-ta-lmes-driver and odh-ta-lmes-job - Remove hardcoded RHOAIENG reference from README onboarding step 3 Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
1 parent 9373f43 commit 5ede32f

3 files changed

Lines changed: 224 additions & 20 deletions

File tree

‎workflows/cve-fixer/.claude/commands/cve.find.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,15 @@ Report: artifacts/cve-fixer/find/cve-issues-20260226-145018.md
100100
b. Construct JQL query and execute API call:
101101
```bash
102102
# Normalize component name with case-insensitive lookup against mapping file
103-
MAPPING_FILE="$(dirname "$0")/../component-repository-mappings.json"
104-
if [ -f "$MAPPING_FILE" ]; then
103+
# Try relative to cwd (workflow root), then repo-relative fallback
104+
if [ -f "component-repository-mappings.json" ]; then
105+
MAPPING_FILE="component-repository-mappings.json"
106+
elif [ -f "workflows/cve-fixer/component-repository-mappings.json" ]; then
107+
MAPPING_FILE="workflows/cve-fixer/component-repository-mappings.json"
108+
else
109+
MAPPING_FILE=""
110+
fi
111+
if [ -n "$MAPPING_FILE" ] && [ -f "$MAPPING_FILE" ]; then
105112
CANONICAL_NAME=$(jq -r --arg name "${COMPONENT_NAME}" \
106113
'.components | keys[] | select(ascii_downcase == ($name | ascii_downcase))' \
107114
"$MAPPING_FILE" | head -1)

‎workflows/cve-fixer/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Each team member using the workflow needs:
110110
- You'll be notified when ready
111111

112112
3. **Coordinate with ProdSec**
113-
- Ensure your Jira component exists in RHOAIENG
113+
- Ensure your Jira component exists in your Jira project
114114
- Verify CVE issues are being filed against your component
115115
- Test with a sample CVE issue
116116

‎workflows/cve-fixer/component-repository-mappings.json‎

Lines changed: 214 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"v2.28.0-fixes",
2424
"v2.27.0-fixes"
2525
],
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.",
2727
"cve_fix_workflow": {
2828
"primary_target": "main",
2929
"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)",
3131
"manual_intervention": "Cherry-pick during code freeze or for patch releases"
3232
},
3333
"repository_type": "monorepo",
@@ -390,7 +390,11 @@
390390
"release-0.6"
391391
],
392392
"branch_strategy": "Fix in main. Release branches follow pattern release-X.Y.",
393-
"repo_type": "upstream"
393+
"repo_type": "upstream",
394+
"cve_fix_workflow": {
395+
"primary_target": "main",
396+
"backport_targets": "release-0.5, release-0.6"
397+
}
394398
},
395399
"opendatahub-io/llm-d-inference-scheduler": {
396400
"github_url": "https://github.com/opendatahub-io/llm-d-inference-scheduler",
@@ -402,7 +406,11 @@
402406
"stable-2.x"
403407
],
404408
"branch_strategy": "Fork of upstream llm-d/llm-d-inference-scheduler. Synced via sync branches. ODH release branches via Konflux replicator.",
405-
"repo_type": "midstream"
409+
"repo_type": "midstream",
410+
"cve_fix_workflow": {
411+
"primary_target": "main",
412+
"backport_targets": "release-0.2, release-0.3.1, release-v0.4, stable-2.x"
413+
}
406414
},
407415
"red-hat-data-services/llm-d-inference-scheduler": {
408416
"github_url": "https://github.com/red-hat-data-services/llm-d-inference-scheduler",
@@ -414,7 +422,11 @@
414422
"rhoai-3.4-ea.2"
415423
],
416424
"branch_strategy": "Fork of midstream. RHOAI release branches follow pattern rhoai-X.Y.",
417-
"repo_type": "downstream"
425+
"repo_type": "downstream",
426+
"cve_fix_workflow": {
427+
"primary_target": "main",
428+
"backport_targets": "rhoai-3.3, rhoai-3.4, rhoai-3.4-ea.1, rhoai-3.4-ea.2"
429+
}
418430
},
419431
"red-hat-data-services/llm-d-routing-sidecar": {
420432
"github_url": "https://github.com/red-hat-data-services/llm-d-routing-sidecar",
@@ -424,16 +436,24 @@
424436
"rhoai-3.0",
425437
"rhoai-3.2"
426438
],
427-
"branch_strategy": "Fork of upstream (now archived). Downstream only — upstream code migrated into llm-d-inference-scheduler. No branches beyond rhoai-3.2.",
439+
"branch_strategy": "Fork of upstream (now archived). Downstream only \u2014 upstream code migrated into llm-d-inference-scheduler. No branches beyond rhoai-3.2.",
428440
"repo_type": "downstream",
429-
"notes": "Upstream llm-d/llm-d-routing-sidecar is archived; code moved to llm-d-inference-scheduler (cmd/pd_sidecar). This downstream repo may be phased out in future releases."
441+
"notes": "Upstream llm-d/llm-d-routing-sidecar is archived; code moved to llm-d-inference-scheduler (cmd/pd_sidecar). This downstream repo may be phased out in future releases.",
442+
"cve_fix_workflow": {
443+
"primary_target": "main",
444+
"backport_targets": "rhoai-2.25, rhoai-3.0, rhoai-3.2"
445+
}
430446
},
431447
"llm-d-incubation/batch-gateway": {
432448
"github_url": "https://github.com/llm-d-incubation/batch-gateway",
433449
"default_branch": "main",
434450
"active_release_branches": [],
435451
"branch_strategy": "Fix in main. No formal release branching documented.",
436-
"repo_type": "upstream"
452+
"repo_type": "upstream",
453+
"cve_fix_workflow": {
454+
"primary_target": "main",
455+
"backport_targets": "None"
456+
}
437457
},
438458
"opendatahub-io/batch-gateway": {
439459
"github_url": "https://github.com/opendatahub-io/batch-gateway",
@@ -442,7 +462,11 @@
442462
"release-v0.5"
443463
],
444464
"branch_strategy": "Fork of upstream llm-d-incubation/batch-gateway.",
445-
"repo_type": "midstream"
465+
"repo_type": "midstream",
466+
"cve_fix_workflow": {
467+
"primary_target": "main",
468+
"backport_targets": "release-v0.5"
469+
}
446470
},
447471
"red-hat-data-services/batch-gateway": {
448472
"github_url": "https://github.com/red-hat-data-services/batch-gateway",
@@ -453,7 +477,11 @@
453477
"rhoai-3.4-ea.2"
454478
],
455479
"branch_strategy": "Fork of midstream. RHOAI release branches follow pattern rhoai-X.Y.",
456-
"repo_type": "downstream"
480+
"repo_type": "downstream",
481+
"cve_fix_workflow": {
482+
"primary_target": "main",
483+
"backport_targets": "rhoai-3.4, rhoai-3.4-ea.1, rhoai-3.4-ea.2"
484+
}
457485
},
458486
"llm-d/llm-d-workload-variant-autoscaler": {
459487
"github_url": "https://github.com/llm-d/llm-d-workload-variant-autoscaler",
@@ -462,7 +490,11 @@
462490
"release-0.4.2"
463491
],
464492
"branch_strategy": "Fix in main. Release branches follow pattern release-X.Y.Z.",
465-
"repo_type": "upstream"
493+
"repo_type": "upstream",
494+
"cve_fix_workflow": {
495+
"primary_target": "main",
496+
"backport_targets": "release-0.4.2"
497+
}
466498
},
467499
"opendatahub-io/workload-variant-autoscaler": {
468500
"github_url": "https://github.com/opendatahub-io/workload-variant-autoscaler",
@@ -471,7 +503,11 @@
471503
"release-v0.5"
472504
],
473505
"branch_strategy": "Fork of upstream llm-d/llm-d-workload-variant-autoscaler. Note: repo name differs from upstream (no llm-d- prefix).",
474-
"repo_type": "midstream"
506+
"repo_type": "midstream",
507+
"cve_fix_workflow": {
508+
"primary_target": "main",
509+
"backport_targets": "release-v0.5"
510+
}
475511
},
476512
"red-hat-data-services/workload-variant-autoscaler": {
477513
"github_url": "https://github.com/red-hat-data-services/workload-variant-autoscaler",
@@ -482,19 +518,79 @@
482518
"rhoai-3.4-ea.2"
483519
],
484520
"branch_strategy": "Fork of midstream. RHOAI release branches follow pattern rhoai-X.Y.",
485-
"repo_type": "downstream"
521+
"repo_type": "downstream",
522+
"cve_fix_workflow": {
523+
"primary_target": "main",
524+
"backport_targets": "rhoai-3.4, rhoai-3.4-ea.1, rhoai-3.4-ea.2"
525+
}
486526
}
487527
}
488528
},
489529
"AI Evaluations": {
490-
"container_to_repo_mapping": {},
530+
"container_to_repo_mapping": {
531+
"rhoai/odh-ta-lmes-driver-rhel9": "opendatahub-io/trustyai-service-operator",
532+
"rhoai/odh-ta-lmes-job-rhel9": "opendatahub-io/lm-evaluation-harness"
533+
},
491534
"repositories": {
492535
"eval-hub/eval-hub": {
493536
"github_url": "https://github.com/eval-hub/eval-hub",
494537
"default_branch": "main",
495538
"active_release_branches": [],
496539
"branch_strategy": "Fix in main. Feature branches follow pattern feature/name or fix/issue.",
497-
"repo_type": "upstream"
540+
"repo_type": "upstream",
541+
"cve_fix_workflow": {
542+
"primary_target": "main",
543+
"backport_targets": "None"
544+
}
545+
},
546+
"eval-hub/eval-hub-sdk": {
547+
"github_url": "https://github.com/eval-hub/eval-hub-sdk",
548+
"default_branch": "main",
549+
"active_release_branches": [],
550+
"branch_strategy": "Fix in main.",
551+
"repo_type": "upstream",
552+
"notes": "No midstream/downstream forks exist yet.",
553+
"cve_fix_workflow": {
554+
"primary_target": "main",
555+
"backport_targets": "None"
556+
}
557+
},
558+
"eval-hub/eval-hub-contrib": {
559+
"github_url": "https://github.com/eval-hub/eval-hub-contrib",
560+
"default_branch": "main",
561+
"active_release_branches": [],
562+
"branch_strategy": "Fix in main.",
563+
"repo_type": "upstream",
564+
"notes": "No midstream/downstream forks exist yet.",
565+
"cve_fix_workflow": {
566+
"primary_target": "main",
567+
"backport_targets": "None"
568+
}
569+
},
570+
"trustyai-explainability/llama-stack-provider-trustyai-garak": {
571+
"github_url": "https://github.com/trustyai-explainability/llama-stack-provider-trustyai-garak",
572+
"default_branch": "main",
573+
"active_release_branches": [],
574+
"branch_strategy": "Fix in main.",
575+
"repo_type": "upstream",
576+
"cve_fix_workflow": {
577+
"primary_target": "main",
578+
"backport_targets": "None"
579+
}
580+
},
581+
"trustyai-explainability/trustyai-service-operator": {
582+
"github_url": "https://github.com/trustyai-explainability/trustyai-service-operator",
583+
"default_branch": "main",
584+
"active_release_branches": [
585+
"release/1.37.0",
586+
"release/1.38.0"
587+
],
588+
"branch_strategy": "Fix in main. Release branches follow pattern release/X.Y.Z.",
589+
"repo_type": "upstream",
590+
"cve_fix_workflow": {
591+
"primary_target": "main",
592+
"backport_targets": "release/1.37.0, release/1.38.0"
593+
}
498594
},
499595
"opendatahub-io/eval-hub": {
500596
"github_url": "https://github.com/opendatahub-io/eval-hub",
@@ -504,7 +600,56 @@
504600
"stable"
505601
],
506602
"branch_strategy": "Fork of upstream eval-hub/eval-hub.",
507-
"repo_type": "midstream"
603+
"repo_type": "midstream",
604+
"cve_fix_workflow": {
605+
"primary_target": "main",
606+
"backport_targets": "release/odh-3.4, stable"
607+
}
608+
},
609+
"opendatahub-io/lm-evaluation-harness": {
610+
"github_url": "https://github.com/opendatahub-io/lm-evaluation-harness",
611+
"default_branch": "main",
612+
"active_release_branches": [
613+
"release/odh-3.3",
614+
"release/odh-3.4",
615+
"release/odh-3.4-ea2",
616+
"release/odh-3.5"
617+
],
618+
"branch_strategy": "ODH fork. Release branches follow pattern release/odh-X.Y.",
619+
"repo_type": "midstream",
620+
"cve_fix_workflow": {
621+
"primary_target": "main",
622+
"backport_targets": "release/odh-3.3, release/odh-3.4, release/odh-3.4-ea2, release/odh-3.5"
623+
}
624+
},
625+
"opendatahub-io/llama-stack-provider-trustyai-garak": {
626+
"github_url": "https://github.com/opendatahub-io/llama-stack-provider-trustyai-garak",
627+
"default_branch": "main",
628+
"active_release_branches": [
629+
"release/odh-3.4",
630+
"stable"
631+
],
632+
"branch_strategy": "Fork of upstream trustyai-explainability/llama-stack-provider-trustyai-garak.",
633+
"repo_type": "midstream",
634+
"cve_fix_workflow": {
635+
"primary_target": "main",
636+
"backport_targets": "release/odh-3.4, stable"
637+
}
638+
},
639+
"opendatahub-io/trustyai-service-operator": {
640+
"github_url": "https://github.com/opendatahub-io/trustyai-service-operator",
641+
"default_branch": "main",
642+
"active_release_branches": [
643+
"release/odh-3.3",
644+
"release/odh-3.4",
645+
"release/odh-3.4-ea2"
646+
],
647+
"branch_strategy": "Fork of upstream trustyai-explainability/trustyai-service-operator. Release branches follow pattern release/odh-X.Y.",
648+
"repo_type": "midstream",
649+
"cve_fix_workflow": {
650+
"primary_target": "main",
651+
"backport_targets": "release/odh-3.3, release/odh-3.4, release/odh-3.4-ea2"
652+
}
508653
},
509654
"red-hat-data-services/eval-hub": {
510655
"github_url": "https://github.com/red-hat-data-services/eval-hub",
@@ -515,7 +660,59 @@
515660
"rhoai-3.4-ea.2"
516661
],
517662
"branch_strategy": "Fork of midstream. RHOAI release branches follow pattern rhoai-X.Y.",
518-
"repo_type": "downstream"
663+
"repo_type": "downstream",
664+
"cve_fix_workflow": {
665+
"primary_target": "main",
666+
"backport_targets": "rhoai-3.4, rhoai-3.4-ea.1, rhoai-3.4-ea.2"
667+
}
668+
},
669+
"red-hat-data-services/lm-evaluation-harness": {
670+
"github_url": "https://github.com/red-hat-data-services/lm-evaluation-harness",
671+
"default_branch": "main",
672+
"active_release_branches": [
673+
"rhoai-3.3",
674+
"rhoai-3.4",
675+
"rhoai-3.4-ea.1",
676+
"rhoai-3.4-ea.2"
677+
],
678+
"branch_strategy": "Fork of midstream. RHOAI release branches follow pattern rhoai-X.Y.",
679+
"repo_type": "downstream",
680+
"cve_fix_workflow": {
681+
"primary_target": "main",
682+
"backport_targets": "rhoai-3.3, rhoai-3.4, rhoai-3.4-ea.1, rhoai-3.4-ea.2"
683+
}
684+
},
685+
"red-hat-data-services/llama-stack-provider-trustyai-garak": {
686+
"github_url": "https://github.com/red-hat-data-services/llama-stack-provider-trustyai-garak",
687+
"default_branch": "main",
688+
"active_release_branches": [
689+
"rhoai-3.3",
690+
"rhoai-3.4",
691+
"rhoai-3.4-ea.1",
692+
"rhoai-3.4-ea.2"
693+
],
694+
"branch_strategy": "Fork of midstream. RHOAI release branches follow pattern rhoai-X.Y.",
695+
"repo_type": "downstream",
696+
"cve_fix_workflow": {
697+
"primary_target": "main",
698+
"backport_targets": "rhoai-3.3, rhoai-3.4, rhoai-3.4-ea.1, rhoai-3.4-ea.2"
699+
}
700+
},
701+
"red-hat-data-services/trustyai-service-operator": {
702+
"github_url": "https://github.com/red-hat-data-services/trustyai-service-operator",
703+
"default_branch": "main",
704+
"active_release_branches": [
705+
"rhoai-3.3",
706+
"rhoai-3.4",
707+
"rhoai-3.4-ea.1",
708+
"rhoai-3.4-ea.2"
709+
],
710+
"branch_strategy": "Fork of midstream. RHOAI release branches follow pattern rhoai-X.Y.",
711+
"repo_type": "downstream",
712+
"cve_fix_workflow": {
713+
"primary_target": "main",
714+
"backport_targets": "rhoai-3.3, rhoai-3.4, rhoai-3.4-ea.1, rhoai-3.4-ea.2"
715+
}
519716
}
520717
}
521718
}

0 commit comments

Comments
 (0)