Skip to content

Commit 47b1502

Browse files
zjhuntinclaude
andcommitted
Fixes #38460 - Version-gate auto publish composite test for Katello < 4.20
Katello #38460 disabled CCV auto-publish on child CV minor version updates, but the fix has not been backported to KATELLO-4.19. This causes test 52 "ensure auto publish composite was auto published" to fail on the 4.19 pipeline, since the incremental update still triggers an auto-publish creating an extra version. Add a version check so Katello < 4.20 uses a fixture that expects the additional 'Auto Publish - Triggered by Component 1 1.1' entry, while 4.20+ continues to use the existing fixture. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent e9b5992 commit 47b1502

2 files changed

Lines changed: 16 additions & 1 deletion

File tree

bats/fb-katello-content.bats

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,11 @@ setup() {
448448
hammer --csv --no-headers content-view version list --organization="${ORGANIZATION}" \
449449
--content-view="${AUTO_PUBLISH_COMPOSITE_VIEW}" --fields=description > auto_publish_composite_versions
450450

451-
diff auto_publish_composite_versions fixtures/auto_publish_composite_versions
451+
if tIsVersionNewer "$(tKatelloVersion)" 4.20; then
452+
diff auto_publish_composite_versions fixtures/auto_publish_composite_versions
453+
else
454+
diff auto_publish_composite_versions fixtures/auto_publish_composite_versions_pre_4.20
455+
fi
452456
}
453457

454458
@test "fetch rpm from yum repository on old path" {
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Auto Publish - Triggered by 'Component 1 1.1'
2+
"Errata:
3+
RHEA-2012:0055
4+
5+
Packages:
6+
penguin-0.9.1-1.noarch
7+
shark-0.1-1.noarch
8+
walrus-5.21-1.noarch"
9+
Auto Publish - Triggered by 'Component 1 1.0'
10+
Auto Publish - Triggered by 'Test CV 2.0'
11+
Auto Publish - Triggered by 'Test CV 1.0'

0 commit comments

Comments
 (0)