From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 471CF3858401 for ; Sat, 6 Aug 2022 23:47:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 471CF3858401 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x0c.wildebeest.org [172.31.17.142]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id D53C1300B36D; Sun, 7 Aug 2022 01:47:12 +0200 (CEST) Received: by reform (Postfix, from userid 1000) id 1B80B2E8220B; Sun, 7 Aug 2022 01:47:12 +0200 (CEST) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [PATCH] Remove more build artifacts at end of build Date: Sun, 7 Aug 2022 01:47:10 +0200 Message-Id: <20220806234710.14824-1-mark@klomp.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: buildbot@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "The https://builder.sourceware.org/ buildbot" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2022 23:47:22 -0000 For those builds that use a separete -build dir fully remove it. For others do a make distclean instead of a simple make clean. For libabigail also remove the libabigail-* tar.gz and distcheck directory which can 400MB+ and 1.5GB+. --- builder/master.cfg | 53 ++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/builder/master.cfg b/builder/master.cfg index f53a45f..ee752fa 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -897,6 +897,10 @@ make_clean_step = steps.ShellCommand( command=["make", "clean"], name="make clean") +make_distclean_step = steps.ShellCommand( + command=["make", "distclean"], + name="make distclean") + # add a V=1 to the make-like step command for builds with automake default-quiet ops import copy def add_make_V1(step): @@ -1469,7 +1473,7 @@ elfutils_factory.addStep(getversion_step) elfutils_factory.addStep(add_make_V1(make_step)) elfutils_factory.addStep(add_make_V1(make_check_test_suite_step)) elfutils_factory.addSteps(elfutils_upload_to_bunsen) -elfutils_factory.addStep(make_clean_step) +elfutils_factory.addStep(make_distclean_step) elfutils_factory_distcheck = util.BuildFactory() elfutils_factory_distcheck.addStep(elfutils_set_package_step) @@ -1481,7 +1485,7 @@ elfutils_factory_distcheck.addStep(add_make_V1(make_step)) elfutils_factory_distcheck.addStep(add_make_V1(make_check_test_suite_step)) elfutils_factory_distcheck.addStep(add_make_V1(make_distcheck_test_suite_step)) elfutils_factory_distcheck.addSteps(elfutils_upload_to_bunsen) -elfutils_factory_distcheck.addStep(make_clean_step) +elfutils_factory_distcheck.addStep(make_distclean_step) elfutils_factory_val = util.BuildFactory() elfutils_factory_val.addStep(elfutils_set_package_step) @@ -1492,7 +1496,7 @@ elfutils_factory_val.addStep(getversion_step) elfutils_factory_val.addStep(add_make_V1(make_step)) elfutils_factory_val.addStep(add_make_V1(make_check_test_suite_step)) elfutils_factory_val.addSteps(elfutils_upload_to_bunsen) -elfutils_factory_val.addStep(make_clean_step) +elfutils_factory_val.addStep(make_distclean_step) elfutils_factory_mvu = util.BuildFactory() elfutils_factory_mvu.addStep(elfutils_set_package_step) @@ -1503,7 +1507,7 @@ elfutils_factory_mvu.addStep(getversion_step) elfutils_factory_mvu.addStep(add_make_V1(make_step)) elfutils_factory_mvu.addStep(add_make_V1(make_check_test_suite_step)) elfutils_factory_mvu.addSteps(elfutils_upload_to_bunsen) -elfutils_factory_mvu.addStep(make_clean_step) +elfutils_factory_mvu.addStep(make_distclean_step) elfutils_factory_mu = util.BuildFactory() elfutils_factory_mu.addStep(elfutils_set_package_step) @@ -1514,7 +1518,7 @@ elfutils_factory_mu.addStep(getversion_step) elfutils_factory_mu.addStep(add_make_V1(make_step)) elfutils_factory_mu.addStep(add_make_V1(make_check_test_suite_step)) elfutils_factory_mu.addSteps(elfutils_upload_to_bunsen) -elfutils_factory_mu.addStep(make_clean_step) +elfutils_factory_mu.addStep(make_distclean_step) elfutils_factory_mua = util.BuildFactory() elfutils_factory_mua.addStep(elfutils_set_package_step) @@ -1525,7 +1529,7 @@ elfutils_factory_mua.addStep(getversion_step) elfutils_factory_mua.addStep(add_make_V1(make_step)) elfutils_factory_mua.addStep(add_make_V1(make_check_test_suite_step)) elfutils_factory_mua.addSteps(elfutils_upload_to_bunsen) -elfutils_factory_mua.addStep(make_clean_step) +elfutils_factory_mua.addStep(make_distclean_step) elfutils_centos_x86_64_builder = util.BuilderConfig( name="elfutils-centos-x86_64", @@ -1862,7 +1866,7 @@ gccrust_factory.addStep(gccrust_make_step) gccrust_factory.addStep(gccrust_check_step) gccrust_factory.addStep(gccrust_check_check_step) gccrust_factory.addSteps(gccrust_bunsen_steps) -gccrust_factory.addStep(gccrust_make_clean_step) +gccrust_factory.addStep(gccrust_rm_build_step) gccrust_bootstrap_factory = util.BuildFactory() gccrust_bootstrap_factory.addStep(gccrust_git_step) @@ -1872,9 +1876,6 @@ gccrust_bootstrap_factory.addStep(gccrust_make_bootstrap_step) gccrust_bootstrap_factory.addStep(gccrust_check_bootstrap_step) gccrust_bootstrap_factory.addStep(gccrust_check_check_step) gccrust_bootstrap_factory.addSteps(gccrust_bunsen_steps) -# It looks like after a bootstrap make clean gets confused -# Just blow away the whole builddir when we are done with it -#gccrust_bootstrap_factory.addStep(gccrust_make_clean_step) gccrust_bootstrap_factory.addStep(gccrust_rm_build_step) gccrust_fedora_x86_64_builder = util.BuilderConfig( @@ -2075,7 +2076,7 @@ binutils_factory.addStep(binutils_step_configure) binutils_factory.addStep(binutils_step_compile) binutils_factory.addStep(binutils_step_check) binutils_factory.addSteps(binutils_steps_bunsen) -binutils_factory.addStep(binutils_make_clean_step) +binutils_factory.addStep(binutils_step_rm_build_dir) binutils_factory_libctf = util.BuildFactory() binutils_factory_libctf.addStep(binutils_step_git) @@ -2084,7 +2085,7 @@ binutils_factory_libctf.addStep(binutils_step_configure_libctf) binutils_factory_libctf.addStep(binutils_step_compile_libctf) binutils_factory_libctf.addStep(binutils_step_check_libctf) binutils_factory_libctf.addSteps(binutils_steps_bunsen_libctf) -binutils_factory_libctf.addStep(binutils_make_clean_step) +binutils_factory_libctf.addStep(binutils_step_rm_build_dir) # Builds everything, but checks just gas and binutils, not ld. binutils_factory_gas_binutils = util.BuildFactory() @@ -2094,7 +2095,7 @@ binutils_factory_gas_binutils.addStep(binutils_step_configure) binutils_factory_gas_binutils.addStep(binutils_step_compile) binutils_factory_gas_binutils.addStep(binutils_step_check_gas_binutils) binutils_factory_gas_binutils.addSteps(binutils_steps_bunsen_gas_binutils) -binutils_factory_gas_binutils.addStep(binutils_make_clean_step) +binutils_factory_gas_binutils.addStep(binutils_step_rm_build_dir) binutils_debian_amd64_builder = util.BuilderConfig( name="binutils-debian-amd64", @@ -2390,7 +2391,7 @@ gdb_factory.addSteps(bunsen_logfile_upload_cpio_steps( # only a few tests being ["*.sum", "*.log"], workdir='gdb-build', tagsuffix='/extended-gdbserver')) -gdb_factory.addStep(gdb_make_clean_step) +gdb_factory.addStep(gdb_rm_step) gdb_32_factory = util.BuildFactory() gdb_32_factory.addStep(gdb_git_step) @@ -2412,7 +2413,7 @@ gdb_32_factory.addSteps(bunsen_logfile_upload_cpio_steps( ["*.sum", "*.log"], workdir='gdb-build', tagsuffix='/extended-gdbserver')) -gdb_32_factory.addStep(gdb_make_clean_step) +gdb_32_factory.addStep(gdb_rm_step) gdb_black_factory = util.BuildFactory() gdb_black_factory.addStep(gdb_git_step) @@ -2435,7 +2436,7 @@ gdb_black_factory.addSteps(bunsen_logfile_upload_cpio_steps( ["*.sum", "*.log"], workdir='gdb-build', tagsuffix='/extended-gdbserver')) -gdb_black_factory.addStep(gdb_make_clean_step) +gdb_black_factory.addStep(gdb_rm_step) # Used for armhf only because of # https://sourceware.org/bugzilla/show_bug.cgi?id=28561 @@ -2447,7 +2448,7 @@ gdb_32_factory_make_only.addStep(gdb_make_step) # NB: no need to fully BUNSEN ME, test suites are not actually being run gdb_32_factory_make_only.addSteps(bunsen_logfile_upload_steps([ # no tests being run - but can save the autoconf config.log (["../gdb-build/gdb/config.log"],"gdb")])) -gdb_32_factory_make_only.addStep(gdb_make_clean_step) +gdb_32_factory_make_only.addStep(gdb_rm_step) gdb_centos_x86_64_builder = util.BuilderConfig( name="gdb-centos-x86_64", @@ -2823,7 +2824,7 @@ gcc_build_factory.addStep(steps.Compile( command=['make', util.Interpolate('-j%(prop:ncpus)s')], name='make', haltOnFailure=True)) -gcc_build_factory.addStep(gcc_build_make_clean_step) +gcc_build_factory.addStep(gcc_rm_build_step) gcc_fedora_x86_64_builder = util.BuilderConfig( name="gcc-fedora-x86_64", @@ -3116,6 +3117,11 @@ libabigail_fast_distcheck = steps.Test( name="make distcheck", haltOnFailure=False, flunkOnFailure=True, timeout=3600, logfiles={"test-suite.log": util.Interpolate('%(prop:package_name)s-%(prop:package_version)s/_build/sub/tests/test-suite.log')}) +# The libabigail-*.tar.gz can be 400MB+ +# if distcheck fails the libabigail-* dir can be 1.5G+ +libabigail_rm_dist = steps.ShellCommand( + command=["rm", "-rf", "libabigail-*"], + name= "rm -rf libabigail-*") libabigail_upload_to_bunsen = bunsen_logfile_upload_cpio_steps( @@ -3131,7 +3137,8 @@ libabigail_factory.addStep(make_step) libabigail_factory.addStep(libabigail_make_check_test_suite_step) libabigail_factory.addStep(libabigail_fast_distcheck) libabigail_factory.addSteps(libabigail_upload_to_bunsen) -libabigail_factory.addStep(make_clean_step) +libabigail_factory.addStep(make_distclean_step) +libabigail_factory.addStep(libabigail_rm_dist) # libabigail build steps factory, no distcheck libabigail_factory_checkonly = util.BuildFactory() @@ -3141,7 +3148,7 @@ libabigail_factory_checkonly.addStep(configure_step) libabigail_factory_checkonly.addStep(make_step) libabigail_factory_checkonly.addStep(libabigail_make_check_test_suite_step) libabigail_factory_checkonly.addSteps(libabigail_upload_to_bunsen) -libabigail_factory_checkonly.addStep(make_clean_step) +libabigail_factory_checkonly.addStep(make_distclean_step) libabigail_centos_x86_64_builder = util.BuilderConfig( name="libabigail-centos-x86_64", @@ -3404,7 +3411,7 @@ valgrind_dist_aux_factory.addStep(configure_step) valgrind_dist_aux_factory.addStep(make_step) valgrind_dist_aux_factory.addStep(make_distcheck_step) valgrind_dist_aux_factory.addStep(valgrind_auxchecks_step) -valgrind_dist_aux_factory.addStep(make_clean_step) +valgrind_dist_aux_factory.addStep(make_distclean_step) valgrind_make_check_aux_factory = util.BuildFactory() valgrind_make_check_aux_factory.addStep(valgrind_git_step) @@ -3413,7 +3420,7 @@ valgrind_make_check_aux_factory.addStep(configure_step) valgrind_make_check_aux_factory.addStep(make_step) valgrind_make_check_aux_factory.addStep(make_check_step) valgrind_make_check_aux_factory.addStep(valgrind_auxchecks_step) -valgrind_make_check_aux_factory.addStep(make_clean_step) +valgrind_make_check_aux_factory.addStep(make_distclean_step) # For arm32 because it is slow and make check doesn't build... valgrind_make_aux_factory = util.BuildFactory() @@ -3422,7 +3429,7 @@ valgrind_make_aux_factory.addStep(valgrind_autogen_step) valgrind_make_aux_factory.addStep(configure_step) valgrind_make_aux_factory.addStep(make_step) valgrind_make_aux_factory.addStep(valgrind_auxchecks_step) -valgrind_make_aux_factory.addStep(make_clean_step) +valgrind_make_aux_factory.addStep(make_distclean_step) valgrind_fedora_x86_64_builder = util.BuilderConfig( name="valgrind-fedora-x86_64", -- 2.30.2