Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ceph for openSUSE:Factory checked in
at 2023-06-03 00:05:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ceph (Old)
and /work/SRC/openSUSE:Factory/.ceph.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph"
Sat Jun 3 00:05:23 2023 rev:89 rq:1089932 version:16.2.13.66+g54799ee0666
Changes:
--------
--- /work/SRC/openSUSE:Factory/ceph/ceph-test.changes 2023-05-12
20:32:51.512627915 +0200
+++ /work/SRC/openSUSE:Factory/.ceph.new.15902/ceph-test.changes
2023-06-03 00:05:23.405339321 +0200
@@ -1,0 +2,5 @@
+Wed May 24 06:26:03 UTC 2023 - Tim Serong <tser...@suse.com>
+
+- Add "#!BuildConstraint" to spec files for compatibility with _multibuild
+
+-------------------------------------------------------------------
ceph.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ceph-test.spec ++++++
--- /var/tmp/diff_new_pack.rdMCs5/_old 2023-06-03 00:05:25.197349903 +0200
+++ /var/tmp/diff_new_pack.rdMCs5/_new 2023-06-03 00:05:25.201349926 +0200
@@ -1,3 +1,5 @@
+#!BuildConstraint: hardware:memory:size unit=G 10
+#!BuildConstraint: hardware:disk:size unit=G 60
#
# spec file for package ceph
#
++++++ ceph.spec ++++++
--- /var/tmp/diff_new_pack.rdMCs5/_old 2023-06-03 00:05:25.221350045 +0200
+++ /var/tmp/diff_new_pack.rdMCs5/_new 2023-06-03 00:05:25.225350068 +0200
@@ -1,3 +1,5 @@
+#!BuildConstraint: hardware:memory:size unit=G 8
+#!BuildConstraint: hardware:disk:size unit=G 50
#
# spec file for package ceph
#
++++++ README-ceph-test.txt ++++++
--- /var/tmp/diff_new_pack.rdMCs5/_old 2023-06-03 00:05:25.261350281 +0200
+++ /var/tmp/diff_new_pack.rdMCs5/_new 2023-06-03 00:05:25.261350281 +0200
@@ -24,3 +24,9 @@
Nathan Cutler
April 17, 2017
+
+Addendum: ceph-test also requires more disk space to build than ceph.
+The pre_checkin.sh script writes #!BuildConstraint lines to both spec
+files to set things up correctly. See the comments in _constraints for
+more details.
+
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.rdMCs5/_old 2023-06-03 00:05:25.297350493 +0200
+++ /var/tmp/diff_new_pack.rdMCs5/_new 2023-06-03 00:05:25.301350517 +0200
@@ -5,6 +5,21 @@
<!--
+ 2023-05-23 - Tim Serong <tser...@suse.com>
+
+ The <overwrite><conditions><package>... construct only works for
+ standalone packages in the build service. This was fine when ceph-test
+ existed as a _link back to ceph. Now that we're using _multibuild to
+ build ceph-test, the constraints specified in this file can't be applied
+ correctly to ceph-test anymore, so I've removed them from this file in
+ favour of "#!BuildConstraint" directives in the spec files.
+
+ This _constraints file remains as a source of documentation. If the
+ disk and memory constraints need to be changed in future, adjust the
+ two `set_build_constraints` lines at the end of pre_checkin.sh and
+ rerun that script to update the spec files.
+
+
2022-03-31 - Tim Serong <tser...@suse.com>
Builds of ceph 16.2.7 on IBS showed the following resource usage (in MB):
@@ -28,6 +43,8 @@
-->
+<!-- Can't do the following anymore - see comments above
+
<hardware>
<disk>
<size unit="G">50</size>
@@ -51,5 +68,6 @@
</hardware>
</overwrite>
+-->
</constraints>
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.rdMCs5/_old 2023-06-03 00:05:25.349350800 +0200
+++ /var/tmp/diff_new_pack.rdMCs5/_new 2023-06-03 00:05:25.353350824 +0200
@@ -271,6 +271,15 @@
cp ceph.changes ${dest_pkg}.changes
}
+function set_build_constraints {
+ local FILE=$1
+ shift
+ sed -i -e '/#!BuildConstraint/d' $FILE
+ for constraint in "$@"; do
+ sed -i -e "1s/^/#!BuildConstraint: $constraint\n/" $FILE
+ done
+}
+
PACKAGE="ceph-test"
SPEC_FILE="ceph.spec"
@@ -293,4 +302,6 @@
insert_line_before "$PACKAGE.spec" "Source95: checkin.sh" "^Source96:"
insert_line_before "$PACKAGE.spec" "Source94: ceph-rpmlintrc" "^Source95:"
copy_changes_file $PACKAGE
+set_build_constraints $SPEC_FILE "hardware:disk:size unit=G 50"
"hardware:memory:size unit=G 8"
+set_build_constraints "$PACKAGE.spec" "hardware:disk:size unit=G 60"
"hardware:memory:size unit=G 10"
