Skip to content

Commit 8a8ad24

Browse files
authored
added logic to guard against builds running with wrong version + fixed ordering in changelog (#19)
1 parent e5d19b1 commit 8a8ad24

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

build-aux/build-debs.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@ printf '%s\n' "1:${OVN_BASE}-pf9-${PF9_VERSION}-${BUILD_NUMBER}" > $TEAMCITY_ROO
4040
# configure.ac gets the dot-separated binary version via pf9_patch_ovn_binary_version
4141
sed -i "s/__PF9_OVN_BUILD_VERSION__/$PF9_OVN_BUILD_VERSION/g" "$ROOT/debian/changelog"
4242

43+
# dpkg-buildpackage only reads the TOPMOST changelog entry. An upstream rebase can
44+
# prepend a new "ovn (X.Y.Z-1)" entry above ours, silently shipping unversioned debs.
45+
ACTUAL_VER=$(cd "$ROOT" && dpkg-parsechangelog -S Version)
46+
if [ "$ACTUAL_VER" != "$PF9_OVN_BUILD_VERSION" ]; then
47+
echo "ERROR: top debian/changelog entry is '$ACTUAL_VER', expected '$PF9_OVN_BUILD_VERSION'."
48+
echo "The Platform9 changelog entry must be the topmost entry in debian/changelog."
49+
exit 1
50+
fi
51+
4352
pf9_patch_ovn_binary_version
4453

4554
# --- OVS CONFIGURATION ---

debian/changelog

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
ovn (25.09.4-1) unstable; urgency=low
2-
[ OVN team ]
3-
* New upstream version
4-
5-
-- OVN team <dev@openvswitch.org> Tue, 16 Jun 2026 12:11:30 -0400
6-
71
ovn (__PF9_OVN_BUILD_VERSION__) unstable; urgency=medium
82
[ Platform9 Systems ]
93
* ovn-northd: added changes to support l2 only ports
104
* container: added support to build ovn container using custom changes
115

126
-- Platform9 Systems <info@platform9.com> Tue, 16 Dec 2025 22:00:00 -0800
137

8+
ovn (25.09.4-1) unstable; urgency=low
9+
[ OVN team ]
10+
* New upstream version
11+
12+
-- OVN team <dev@openvswitch.org> Tue, 16 Jun 2026 12:11:30 -0400
13+
1414
ovn (25.09.3-1) unstable; urgency=low
1515
[ OVN team ]
1616
* New upstream version

0 commit comments

Comments
 (0)