Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2018-02-14 10:51:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools" Wed Feb 14 10:51:24 2018 rev:55 rq:576065 version:20180213.3e3f458 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2018-02-13 10:32:41.641979487 +0100 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes 2018-02-14 10:51:24.726137110 +0100 @@ -1,0 +2,18 @@ +Tue Feb 13 12:35:15 UTC 2018 - opensuse-releaset...@opensuse.org + +- Update to version 20180213.3e3f458: + * conf: SLE-15: set pkglistgen-product-family-last to SLE-11:GA. + * pkglistgen: expose pkglistgen-product-family-last config option. + * osclib/util: project_list_family_prior(): provide last parameter. + * osclib/util: project_list_family(): handle IBS SLE naming style. + * pkglistgen: do_update_and_solve(): check for existence of :DVD instead of rings. + +------------------------------------------------------------------- +Tue Feb 13 00:11:41 UTC 2018 - opensuse-releaset...@opensuse.org + +- Update to version 20180212.7f93dbe: + * Skip automatic rebuild for more pattern packages + * Avoid hitting the request limit + * Fix rebuildpacs for armv6/armv7 architectures + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20180212.87ab899.obscpio New: ---- openSUSE-release-tools-20180213.3e3f458.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.khAyf5/_old 2018-02-14 10:51:25.406112638 +0100 +++ /var/tmp/diff_new_pack.khAyf5/_new 2018-02-14 10:51:25.410112494 +0100 @@ -20,7 +20,7 @@ %define source_dir osc-plugin-factory %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20180212.87ab899 +Version: 20180213.3e3f458 Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0+ AND MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.khAyf5/_old 2018-02-14 10:51:25.446111198 +0100 +++ /var/tmp/diff_new_pack.khAyf5/_new 2018-02-14 10:51:25.450111054 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/osc-plugin-factory.git</param> - <param name="changesrevision">4e3148aace6f7a6889a36ff2d2d420b189229f38</param> + <param name="changesrevision">3e3f4589f990ae2bae13dc05b947c8b0cda41a57</param> </service> </servicedata> ++++++ openSUSE-release-tools-20180212.87ab899.obscpio -> openSUSE-release-tools-20180213.3e3f458.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180212.87ab899/osclib/conf.py new/openSUSE-release-tools-20180213.3e3f458/osclib/conf.py --- old/openSUSE-release-tools-20180212.87ab899/osclib/conf.py 2018-02-12 23:54:51.000000000 +0100 +++ new/openSUSE-release-tools-20180213.3e3f458/osclib/conf.py 2018-02-13 13:27:35.000000000 +0100 @@ -108,6 +108,7 @@ 'pkglistgen-archs': 'x86_64', 'pkglistgen-ignore-unresolvable': '1', 'pkglistgen-ignore-recommended': '1', + 'pkglistgen-product-family-last': 'SUSE:SLE-11:GA', }, r'SUSE:(?P<project>.*$)': { 'staging': 'SUSE:%(project)s:Staging', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180212.87ab899/osclib/util.py new/openSUSE-release-tools-20180213.3e3f458/osclib/util.py --- old/openSUSE-release-tools-20180212.87ab899/osclib/util.py 2018-02-12 23:54:51.000000000 +0100 +++ new/openSUSE-release-tools-20180213.3e3f458/osclib/util.py 2018-02-13 13:27:35.000000000 +0100 @@ -13,7 +13,7 @@ count_original = project.count(':') if project.startswith('SUSE:SLE'): project = ':'.join(project.split(':')[:2]) - family_filter = lambda p: p.endswith(':GA') and not p.startswith('SUSE:SLE-11') + family_filter = lambda p: p.count(':') == count_original and p.endswith(':GA') else: family_filter = lambda p: p.count(':') == count_original @@ -22,7 +22,7 @@ return filter(family_filter, projects) -def project_list_family_prior(apiurl, project, include_self=False): +def project_list_family_prior(apiurl, project, include_self=False, last=None): """ Determine the available projects within the same product family released prior to the specified project. @@ -39,6 +39,9 @@ if past: prior.append(entry) + if entry == last: + break + return prior def project_list_family_sorter(project): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180212.87ab899/pkglistgen.py new/openSUSE-release-tools-20180213.3e3f458/pkglistgen.py --- old/openSUSE-release-tools-20180212.87ab899/pkglistgen.py 2018-02-12 23:54:51.000000000 +0100 +++ new/openSUSE-release-tools-20180213.3e3f458/pkglistgen.py 2018-02-13 13:27:35.000000000 +0100 @@ -1065,7 +1065,7 @@ self.options.repos.append('/'.join([opts.project, 'bootstrap_copy'])) # DVD project first since it depends on main. - if api.rings: + if api.item_exists(opts.project + ':DVD'): opts_dvd = copy.deepcopy(opts) opts_dvd.project += ':DVD' self.options.repos.insert(0, '/'.join([opts_dvd.project, main_repo])) @@ -1169,9 +1169,10 @@ # Ensure solv files from all releases in product family are updated. print('-> solv_cache_update') cache_dir_solv = save_cache_path('opensuse-packagelists', 'solv') + family_last = target_config.get('pkglistgen-product-family-last') family_include = target_config.get('pkglistgen-product-family-include') solv_prior = self.solv_cache_update( - apiurl, cache_dir_solv, target_project, family_include, opts) + apiurl, cache_dir_solv, target_project, family_last, family_include, opts) # Include pre-final release solv files for target project. These # files will only exist from previous runs. @@ -1211,11 +1212,12 @@ self.build_stub(release_dir, 'spec') self.commit_package(release_dir) - def solv_cache_update(self, apiurl, cache_dir_solv, target_project, family_include, opts): + def solv_cache_update(self, apiurl, cache_dir_solv, target_project, family_last, family_include, opts): """Dump solv files (do_dump_solv) for all products in family.""" prior = set() - project_family = project_list_family_prior(apiurl, target_project, include_self=True) + project_family = project_list_family_prior( + apiurl, target_project, include_self=True, last=family_last) if family_include: # Include projects from a different family if desired. project_family.extend(project_list_family(apiurl, family_include)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180212.87ab899/rebuildpacs.pl new/openSUSE-release-tools-20180213.3e3f458/rebuildpacs.pl --- old/openSUSE-release-tools-20180212.87ab899/rebuildpacs.pl 2018-02-12 23:54:51.000000000 +0100 +++ new/openSUSE-release-tools-20180213.3e3f458/rebuildpacs.pl 2018-02-13 13:27:35.000000000 +0100 @@ -161,6 +161,7 @@ my $api = "/build/$project?cmd=rebuild&repository=$repo&arch=$arch"; for my $package (sort keys %torebuild) { next if (defined $ignored{$package}); + last if (length($api) > 32767); $api .= "&package=" . uri_escape( $package ); } system("osc api -X POST '$api'"); @@ -207,7 +208,7 @@ open(OSC, "osc api /build/$project/$repo/$arch/$package/_buildinfo|"); my $xml = join('', <OSC>); if ($xml !~ m/^</) { - die "failed to open /build/$project/$repo/$arch/$package/_buildinfo"; + die "failed to open /build/$project/$repo/$arch/$package/_buildinfo"; } $xml = XMLin($xml, ForceArray => 1); close(OSC); @@ -244,11 +245,15 @@ close(PACKAGES); # read the problems out of installcheck -open( INSTALLCHECK, "installcheck $arch $pfile|" ); +my $rpmarch = $arch; +$rpmarch = "armv7hl" if ($arch eq "armv7l"); +$rpmarch = "armv6hl" if ($arch eq "armv6l"); + +open( INSTALLCHECK, "/usr/bin/installcheck $rpmarch $pfile|" ); while (<INSTALLCHECK>) { chomp; - if (m/^can't install (.*)\-[^-]*\-[^-]*\.($arch|noarch):/) { + if (m/^can't install (.*)\-[^-]*\-[^-]*\.($rpmarch|noarch):/) { $cproblem = $1; $cproblem =~ s/kmp-([^-]*)/kmp-default/; $cproblem = find_source_container($cproblem); @@ -265,11 +270,18 @@ # very thin ice here s,\(\)\(64bit\),,; - s,(needed by [^ ]*)\-[^-]*\-[^-]*\.($arch|noarch)$,$1,; + s,(needed by [^ ]*)\-[^-]*\-[^-]*\.($rpmarch|noarch)$,$1,; s,^\s*,,; # patterns are too spammy and rebuilding doesn't help - next if (grep { $_ eq $cproblem } qw(patterns-openSUSE installation-images:Kubic fftw3:gnu-openmpi-hpc hdf5:mvapich2 hdf5:openmpi hdf5:serial scalapack:gnu-mvapich2-hpc scalapack:gnu-openmpi-hpc python-numpy:gnu-hpc petsc:serial netcdf:serial netcdf:openmpi netcdf:gnu-hpc netcdf:gnu-openmpi-hpc netcdf:gnu-mvapich2-hpc)); + next if (grep { $_ eq $cproblem } qw( + patterns-openSUSE patterns-base patterns-haskell + patterns-mate patterns-media patterns-yast + installation-images:Kubic fftw3:gnu-openmpi-hpc hdf5:mvapich2 + hdf5:openmpi hdf5:serial scalapack:gnu-mvapich2-hpc + scalapack:gnu-openmpi-hpc python-numpy:gnu-hpc + petsc:serial netcdf:serial netcdf:openmpi netcdf:gnu-hpc + netcdf:gnu-openmpi-hpc netcdf:gnu-mvapich2-hpc)); $problems{$cproblem}->{$_} = 1; } @@ -316,6 +328,7 @@ $api = "/build/$project?cmd=rebuild&repository=$repo&arch=$arch"; for my $package (@packages) { $package = $package->{package}; + last if (length($api) > 32767); if (!$problems{$package}) { # it can go @@ -325,8 +338,8 @@ my $oproblem = $oproblems{$package} || ''; if ($problems{$package} eq $oproblem) { - # rebuild won't help - next; + # rebuild won't help + next; } $rebuildit = 1; print "rebuild ", $package, ": ", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180212.87ab899/tests/util_tests.py new/openSUSE-release-tools-20180213.3e3f458/tests/util_tests.py --- old/openSUSE-release-tools-20180212.87ab899/tests/util_tests.py 2018-02-12 23:54:51.000000000 +0100 +++ new/openSUSE-release-tools-20180213.3e3f458/tests/util_tests.py 2018-02-13 13:27:35.000000000 +0100 @@ -25,12 +25,7 @@ ] elif prefix == 'SUSE': return [ - 'SUSE:SLE-10', - 'SUSE:SLE-10:SP2', - 'SUSE:SLE-11', - 'SUSE:SLE-11:GA', - 'SUSE:SLE-11:SP1', - 'SUSE:SLE-11:SP1:Update', + # Names reflect IBS as OBS differs for no apparent reason. 'SUSE:SLE-12:GA', 'SUSE:SLE-12-SP1:GA', 'SUSE:SLE-12-SP1:Update', @@ -71,6 +66,9 @@ projects = project_list_family_prior(None, 'openSUSE:Leap:15.0') self.assertEqual(projects, ['openSUSE:Leap:42.3', 'openSUSE:Leap:42.2']) + projects = project_list_family_prior(None, 'openSUSE:Leap:15.0', last='openSUSE:Leap:42.3') + self.assertEqual(projects, ['openSUSE:Leap:42.3']) + projects = project_list_family_prior(None, 'openSUSE:Leap:42.3') self.assertEqual(projects, ['openSUSE:Leap:42.2']) ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.khAyf5/_old 2018-02-14 10:51:26.062089029 +0100 +++ /var/tmp/diff_new_pack.khAyf5/_new 2018-02-14 10:51:26.062089029 +0100 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20180212.87ab899 -mtime: 1518476091 -commit: 87ab899c92d3fa121d505760572d65995f57a95f +version: 20180213.3e3f458 +mtime: 1518524855 +commit: 3e3f4589f990ae2bae13dc05b947c8b0cda41a57