Change-Id: I588493f0a327c2f4404b476432b8a15c488fd18f
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3906
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
... | ... |
@@ -14,7 +14,7 @@ from SpecData import SPECS |
14 | 14 |
|
15 | 15 |
class PackageManager(object): |
16 | 16 |
|
17 |
- def __init__(self,logName=None,logPath=None): |
|
17 |
+ def __init__(self,logName=None,logPath=None,pkgBuildType="chroot"): |
|
18 | 18 |
if logName is None: |
19 | 19 |
logName = "PackageManager" |
20 | 20 |
if logPath is None: |
... | ... |
@@ -22,7 +22,6 @@ class PackageManager(object): |
22 | 22 |
self.logName=logName |
23 | 23 |
self.logPath=logPath |
24 | 24 |
self.logger=Logger.getLogger(logName,logPath) |
25 |
- self.dockerClient = docker.from_env(version="auto") |
|
26 | 25 |
self.mapCyclesToPackageList={} |
27 | 26 |
self.mapPackageToCycle={} |
28 | 27 |
self.sortedPackageList=[] |
... | ... |
@@ -33,7 +32,9 @@ class PackageManager(object): |
33 | 33 |
self.listAvailableCyclicPackages=[] |
34 | 34 |
self.listBuildOptionPackages=[] |
35 | 35 |
self.pkgBuildOptionFile="" |
36 |
- self.pkgBuildType="chroot" |
|
36 |
+ self.pkgBuildType=pkgBuildType |
|
37 |
+ if self.pkgBuildType == "container": |
|
38 |
+ self.dockerClient = docker.from_env(version="auto") |
|
37 | 39 |
|
38 | 40 |
def readPackageBuildData(self, listPackages): |
39 | 41 |
try: |
... | ... |
@@ -292,7 +292,7 @@ def buildSRPMList(srpmPath, yamlDir, blackListPkgs, logger, singleFile=True): |
292 | 292 |
def buildAPackage(package, listBuildOptionPackages, pkgBuildOptionFile, buildThreads, pkgBuildType): |
293 | 293 |
listPackages=[] |
294 | 294 |
listPackages.append(package) |
295 |
- pkgManager = PackageManager() |
|
295 |
+ pkgManager = PackageManager(pkgBuildType=pkgBuildType) |
|
296 | 296 |
if constants.rpmCheck: |
297 | 297 |
constants.setTestForceRPMS(listPackages[:]) |
298 | 298 |
pkgManager.buildPackages(listPackages, listBuildOptionPackages, pkgBuildOptionFile, buildThreads, pkgBuildType) |
... | ... |
@@ -304,7 +304,7 @@ def buildPackagesForAllSpecs(listBuildOptionPackages, pkgBuildOptionFile, logger |
304 | 304 |
logger.info(listPackages) |
305 | 305 |
if constants.rpmCheck: |
306 | 306 |
constants.setTestForceRPMS(listPackages[:]) |
307 |
- pkgManager = PackageManager() |
|
307 |
+ pkgManager = PackageManager(pkgBuildType=pkgBuildType) |
|
308 | 308 |
pkgManager.buildPackages(listPackages, listBuildOptionPackages, pkgBuildOptionFile, buildThreads, pkgBuildType) |
309 | 309 |
|
310 | 310 |
#Generating package info file which is required by installer |