1. photon
  2. Commit 61d640ad1bf8601b6402f8ebdb27140e1e9bc2c5
Browse code

Fix for "make check"

Since all the required packages already be built
before doing "make check" so no need for checking
build dependencies and hence no need for creation of
any dependency graph or tree.
The list of packages passed for makecheck can
directly be schedule by scheduler.

This is a follow up patch to
commit: db1f5400ed3f8b2a069f5f2dfeb1ba2459e9d23a

Change-Id: Ie84c3749aa47643aa84da2f4a283759ca502fb95
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/7388
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Srivatsa S. Bhat <srivatsab@vmware.com>
(cherry picked from commit 3bc7b2dd9515cdb33564fa044aeadd226a41d6cd)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/7417
Reviewed-by: Ankit Jain <ankitja@vmware.com>

Ankit Jain authored on 2019/06/05 20:17:08
Showing 2 changed files
support/package-builder/PackageBuilder.py
History View file @ 61d640a
... ... 
@@ -31,7 +31,7 @@ class PackageBuilder(object):
31 31 
         #test only if the package is in the testForceRPMS with rpmCheck
32 32 
         #build only if the package is not in the testForceRPMS with rpmCheck
33 33
34 
-        if not constants.rpmCheck or packageName in constants.testForceRPMS:
34 
+        if not (constants.rpmCheck or packageName in constants.testForceRPMS):
35 35 
             if self._checkIfPackageIsAlreadyBuilt(packageName, packageVersion, doneList):
36 36 
                 return
37 37
support/package-builder/PackageManager.py
History View file @ 61d640a
... ... 
@@ -66,9 +66,11 @@ class PackageManager(object):
66 66 
     def buildPackages(self, listPackages, buildThreads):
67 67 
         if constants.rpmCheck:
68 68 
             constants.rpmCheck = False
69 
+            constants.addMacro("with_check", "0")
69 70 
             self.buildToolChainPackages(buildThreads)
70 71 
             self._buildTestPackages(buildThreads)
71 72 
             constants.rpmCheck = True
73 
+            constants.addMacro("with_check", "1")
72 74 
             self._buildGivenPackages(listPackages, buildThreads)
73 75 
         else:
74 76 
             self.buildToolChainPackages(buildThreads)
... ... 
@@ -128,8 +130,11 @@ class PackageManager(object):
128 128 
                     not constants.rpmCheck):
129 129 
                 listPackagesToBuild.remove(pkg)
130 130
131 
-        if not self._readPackageBuildData(listPackagesToBuild):
132 
-            return False
131 
+        if constants.rpmCheck:
132 
+            self.sortedPackageList = listPackagesToBuild
133 
+        else:
134 
+            if not self._readPackageBuildData(listPackagesToBuild):
135 
+                return False
133 136
134 137 
         if self.sortedPackageList:
135 138 
             self.logger.info("List of packages yet to be built...")