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-27 23:15:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ceph (Old) and /work/SRC/openSUSE:Factory/.ceph.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph" Tue Jun 27 23:15:58 2023 rev:90 rq:1095539 version:16.2.13.66+g54799ee0666 Changes: -------- --- /work/SRC/openSUSE:Factory/ceph/ceph-test.changes 2023-06-03 00:05:23.405339321 +0200 +++ /work/SRC/openSUSE:Factory/.ceph.new.15902/ceph-test.changes 2023-06-27 23:16:12.159227770 +0200 @@ -1,0 +2,5 @@ +Tue Jun 27 01:08:52 UTC 2023 - Tim Serong <tser...@suse.com> + +- Remove _constraints file, add README-constraints.txt and pre_checkin.env + +------------------------------------------------------------------- ceph.changes: same change Old: ---- _constraints New: ---- README-constraints.txt pre_checkin.env ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-test.spec ++++++ --- /var/tmp/diff_new_pack.r4DF0Q/_old 2023-06-27 23:16:13.483235563 +0200 +++ /var/tmp/diff_new_pack.r4DF0Q/_new 2023-06-27 23:16:13.491235609 +0200 @@ -156,9 +156,11 @@ URL: http://ceph.com/ Source0: %{?_remote_tarball_prefix}ceph-16.2.13-66-g54799ee0666.tar.bz2 %if 0%{?suse_version} -Source94: ceph-rpmlintrc -Source95: checkin.sh -Source96: pre_checkin.sh +Source92: ceph-rpmlintrc +Source93: checkin.sh +Source94: pre_checkin.sh +Source95: pre_checkin.env +Source96: README-constraints.txt Source97: README-ceph-test.txt Source98: README-checkin.txt Source99: README-packaging.txt ++++++ README-ceph-test.txt ++++++ --- /var/tmp/diff_new_pack.r4DF0Q/_old 2023-06-27 23:16:13.587236174 +0200 +++ /var/tmp/diff_new_pack.r4DF0Q/_new 2023-06-27 23:16:13.591236198 +0200 @@ -24,9 +24,3 @@ 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. - ++++++ README-constraints.txt ++++++ 2023-06-13 - Tim Serong <tser...@suse.com> Ceph needs plenty of disk space and RAM in order to build. To set minimum requirements for these, we're using #!BuildConstraint directives in ceph.spec and ceph-test.spec. We were previously using a _constraints file, but this was shown to not always work correctly with _multibuild. For more information about #!BuildConstraint directives see https://github.com/openSUSE/obs-docu/pull/285, and in particular Darix's comment that you shouldn't mix _constraints and #!BuildConstraint. The #!BuildConstraint directives are added to the spec files automatically by the pre_checkin.sh script. If the disk and memory constraints need to be changed in future, adjust the variables in the pre_checkin.env file and re-run pre_checkin.sh. The current constraints are based on builds of ceph 16.2.7 on build.suse.de, which showed the following resource usage (in MB): ceph aarch64 max disk: 41568 max mem: 13698 (on ibs-centriq-6:3 disk: 65536 mem: 18432) ceph x86_64 max disk: 41621 max mem: 9852 (on sheep74:2 disk: 51200 mem: 12500) ceph ppc64le max disk: 42005 max mem: 8754 (on ibs-power9-10:1 disk: 61440 mem: 20480) ceph s390x max disk: 40698 max mem: 8875 (on s390zl36:1 disk: 51200 mem: 10240) ceph-test x86_64 max disk: 51760 max mem: 16835 (on sheep94:2 disk: 112640 mem: 16384) Based on the above, and to hopefully provide a little wiggle room for the future while at the same time not being too demanding of workers, the minimum disk size is 50GB for ceph and 60GB for ceph-test. Memory requirements remain at 8GB and 10GB respectively as they were before I did the above tests - despite the memory usage shown above, AFAIK we haven't run out of memory during builds, and this keeps the pool of possible workers noticeably larger than it would be if we required 16GB. ++++++ pre_checkin.env ++++++ # build constraints in GB (see README-constraints.txt) CEPH_BUILD_DISK_SIZE_GB="50" CEPH_BUILD_MEMORY_SIZE_GB="8" CEPH_TEST_BUILD_DISK_SIZE_GB="60" CEPH_TEST_BUILD_MEMORY_SIZE_GB="10" ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.r4DF0Q/_old 2023-06-27 23:16:13.727236998 +0200 +++ /var/tmp/diff_new_pack.r4DF0Q/_new 2023-06-27 23:16:13.731237021 +0200 @@ -283,6 +283,15 @@ PACKAGE="ceph-test" SPEC_FILE="ceph.spec" +source ./pre_checkin.env +if [ -z "$CEPH_BUILD_DISK_SIZE_GB" -o \ + -z "$CEPH_BUILD_MEMORY_SIZE_GB" -o \ + -z "$CEPH_TEST_BUILD_DISK_SIZE_GB" -o \ + -z "$CEPH_TEST_BUILD_MEMORY_SIZE_GB" ]; then + echo "ERROR: build constraints not set (see README-constraints.txt)"; + exit 1 +fi + files=`packages_files $SPEC_FILE $PACKAGE` if [[ "$?" == "1" ]]; then echo "ERROR: " @@ -298,10 +307,12 @@ insert_line_before "$PACKAGE.spec" "Source99: README-packaging.txt" "_insert_obs_source_lines_here" insert_line_before "$PACKAGE.spec" "Source98: README-checkin.txt" "^Source99:" insert_line_before "$PACKAGE.spec" "Source97: README-ceph-test.txt" "^Source98:" -insert_line_before "$PACKAGE.spec" "Source96: pre_checkin.sh" "^Source97:" -insert_line_before "$PACKAGE.spec" "Source95: checkin.sh" "^Source96:" -insert_line_before "$PACKAGE.spec" "Source94: ceph-rpmlintrc" "^Source95:" +insert_line_before "$PACKAGE.spec" "Source96: README-constraints.txt" "^Source97:" +insert_line_before "$PACKAGE.spec" "Source95: pre_checkin.env" "^Source96:" +insert_line_before "$PACKAGE.spec" "Source94: pre_checkin.sh" "^Source95:" +insert_line_before "$PACKAGE.spec" "Source93: checkin.sh" "^Source94:" +insert_line_before "$PACKAGE.spec" "Source92: ceph-rpmlintrc" "^Source93:" 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" +set_build_constraints $SPEC_FILE "hardware:disk:size unit=G ${CEPH_BUILD_DISK_SIZE_GB}" "hardware:memory:size unit=G ${CEPH_BUILD_MEMORY_SIZE_GB}" +set_build_constraints "$PACKAGE.spec" "hardware:disk:size unit=G ${CEPH_TEST_BUILD_DISK_SIZE_GB}" "hardware:memory:size unit=G ${CEPH_TEST_BUILD_MEMORY_SIZE_GB}"
