GitList

Browse code

package builder: fix updated packages regression

There is a but in building updated packages.
Let's say we have updated spec files for docker and libgcrypt
All other RPMS are available and up to date.

docker -br-> systemd -r-> libgcrypt
where:
br - BuildRequires
r - Requires

Package builder will build both packages in parallel.
docker build will fail as libgcrypt RPM is not available.

I does not happen during full boot, because before docker it will
build systemd which requires libgcrypt to be built first.

Fixing it by looking on entire dependency tree as a requirement
in order to put current package in nextPackagesReadyToBuild list.

Change-Id: I3be167d1677c267b58835fb58159801137840bac
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6802
Tested-by: michellew <michellew@vmware.com>
Reviewed-by: Bo Gan <ganb@vmware.com>

Alexey Makhalov authored on 2019/02/27 12:17:41
Showing 1 changed files

support/package-builder/Scheduler.py

History View file @ c4b9b12

@@ -559,8 +559,20 @@ class Scheduler(object):
                              for pkg in Scheduler.listOfPackagesToBuild:
                                  if pkg in Scheduler.listOfPackagesCurrentlyBuilding:
                                      continue
                     -            listRequiredPackages = list(set(Scheduler._getBuildRequiredPackages(pkg) + \
                     -                                   Scheduler._getRequiredPackages(pkg)))
                     +            listRequiredSubPackages = list(set(SPECS.getData().getBuildRequiresForPkg(pkg) + \
                     +                                   SPECS.getData().getRequiresAllForPkg(pkg)))
+                    +
                     +            # extend to full Requires tree
                     +            for p in listRequiredSubPackages:
                     +                reqs = SPECS.getData().getRequiresAllForPkg(p)
                     +                for r in reqs:
                     +                    if r not in listRequiredSubPackages:
                     +                        listRequiredSubPackages.append(r)
+                    +
                     +            # convert subpackages to basepkg
                     +            listRequiredPackages = set()
                     +            for p in listRequiredSubPackages:
                     +                listRequiredPackages.add(SPECS.getData().getBasePkg(p))
                                  canBuild = True
                                  for reqPkg in listRequiredPackages: