@@ -41,18 +41,29 @@ else

 PHOTON_PUBLISH_RPMS := publish-rpms

 endif

-ifdef PHOTON_ENABLE_RPMCHECK

-PHOTON_RPMCHECK_OPTION := -u

+# Tri state RPMCHECK:

+# 1) RPMCHECK is not specified:  just build

+# 2) RPMCHECK=enable: build and run %check section. do not stop on error. will generate report file.

+# 3) RPMCHECK=enable_stop_on_error: build and run %check section. stop on first error.

+#

+# We use 2 parameters:

+# -u: enable checking.

+# -q: quit on error. if -q is not specified it will keep going

+

+ifeq ($(RPMCHECK),enable)

+PHOTON_RPMCHECK_FLAGS := -u

+else ifeq ($(RPMCHECK),enable_stop_on_error)

+PHOTON_RPMCHECK_FLAGS := -u -q

 else

-PHOTON_RPMCHECK_OPTION := 

+PHOTON_RPMCHECK_FLAGS :=

 endif

 TOOLS_BIN := $(SRCROOT)/tools/bin

 CONTAIN := $(TOOLS_BIN)/contain

 .PHONY : all iso clean photon-build-machine photon-vagrant-build photon-vagrant-local cloud-image \

-check check-docker check-bison check-g++ check-gawk check-createrepo check-vagrant check-packer check-packer-ovf-plugin check-sanity \

-clean-install clean-chroot build-updated-packages

+check-tools check-docker check-bison check-g++ check-gawk check-createrepo check-vagrant check-packer check-packer-ovf-plugin check-sanity \

+clean-install clean-chroot build-updated-packages check

 THREADS?=1

@@ -61,7 +72,7 @@ all: iso minimal-iso docker-image ostree-host-iso live-iso cloud-image-all src-i

 micro: micro-iso

 	@:

-micro-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO)

+micro-iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO)

 	@echo "Building Photon Micro ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         $(PHOTON_INSTALLER) \

@@ -75,7 +86,7 @@ micro-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO)

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

-packages-micro: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) generate-dep-lists

+packages-micro: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) generate-dep-lists

 	@echo "Building all Micro RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

         $(PHOTON_PACKAGE_BUILDER) -o full \

@@ -90,13 +101,13 @@ packages-micro: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) g

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

-                $(PHOTON_RPMCHECK_OPTION) \

+                $(PHOTON_RPMCHECK_FLAGS) \

                 -t ${THREADS}

 minimal: minimal-iso

 	@:

-minimal-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)

+minimal-iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)

 	@echo "Building Photon Minimal ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         $(PHOTON_INSTALLER) \

@@ -110,7 +121,7 @@ minimal-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

-ostree-host-iso: check $(PHOTON_STAGE) ostree-repo

+ostree-host-iso: check-tools $(PHOTON_STAGE) ostree-repo

 	@echo "Building Photon OSTree Host ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         $(PHOTON_INSTALLER) \

@@ -124,7 +135,7 @@ ostree-host-iso: check $(PHOTON_STAGE) ostree-repo

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

-live-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) minimal-iso

+live-iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) minimal-iso

 	@echo "Building Photon Minimal LIVE ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         $(PHOTON_INSTALLER) \

@@ -138,7 +149,7 @@ live-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) minimal-iso

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

-packages-minimal: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) generate-dep-lists

+packages-minimal: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) generate-dep-lists

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

         $(PHOTON_PACKAGE_BUILDER) -o full \

@@ -153,10 +164,10 @@ packages-minimal: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

-                $(PHOTON_RPMCHECK_OPTION) \

+                $(PHOTON_RPMCHECK_FLAGS) \

                 -t ${THREADS}

-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo

+iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo

 	@echo "Building Photon Full ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         sudo $(PHOTON_INSTALLER) \

@@ -171,7 +182,7 @@ iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

-custom-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES)

+custom-iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES)

 	@echo "Building Photon custom ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         sudo $(PHOTON_INSTALLER) \

@@ -186,7 +197,7 @@ custom-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES)

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

-src-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES)

+src-iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES)

 	@echo "Building Photon Full Source ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         sudo $(PHOTON_INSTALLER) \

@@ -215,7 +226,7 @@ who-needs:

 	@cd $(PHOTON_SPECDEPS_DIR) && \

 		$(PHOTON_SPECDEPS) -s $(PHOTON_SPECS_DIR) -i who-needs -p $(pkg) 

-packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

+packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

         $(PHOTON_PACKAGE_BUILDER) -o full \

@@ -233,10 +244,10 @@ packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTA

                 -v $(PHOTON_RELEASE_VERSION) \

                 -w $(PHOTON_DATA_DIR)/pkg_info.json \

                 -g $(PHOTON_DATA_DIR)/pkg_build_options.json \

-                $(PHOTON_RPMCHECK_OPTION) \

+                $(PHOTON_RPMCHECK_FLAGS) \

                 -t ${THREADS}

-updated-packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

+updated-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building only updated RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

         $(PHOTON_PACKAGE_BUILDER) -o full \

@@ -252,10 +263,10 @@ updated-packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

                 -k $(PHOTON_INPUT_RPMS_DIR) \

-                $(PHOTON_RPMCHECK_OPTION) \

+                $(PHOTON_RPMCHECK_FLAGS) \

                 -t ${THREADS}

-tool-chain-stage1: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

+tool-chain-stage1: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

         $(PHOTON_PACKAGE_BUILDER) -o full \

@@ -272,10 +283,10 @@ tool-chain-stage1: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

-                $(PHOTON_RPMCHECK_OPTION) \

+                $(PHOTON_RPMCHECK_FLAGS) \

                 -m stage1

-tool-chain-stage2: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

+tool-chain-stage2: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

         $(PHOTON_PACKAGE_BUILDER) -o full \

@@ -292,7 +303,7 @@ tool-chain-stage2: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

-                $(PHOTON_RPMCHECK_OPTION) \

+                $(PHOTON_RPMCHECK_FLAGS) \

                 -m stage2

@@ -453,7 +464,7 @@ cloud-image-all: $(PHOTON_STAGE) iso

 	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ova $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso $(ADDITIONAL_RPMS_PATH)

-check: check-bison check-g++ check-gawk check-createrepo check-texinfo check-sanity check-docker

+check-tools: check-bison check-g++ check-gawk check-createrepo check-texinfo check-sanity check-docker

 check-docker:

 	@command -v docker >/dev/null 2>&1 || { echo "Package docker not installed. Aborting." >&2; exit 1; }

@@ -491,7 +502,32 @@ endif

 check-packer-ovf-plugin:

 	@[[ -e ~/.packer.d/plugins/packer-post-processor-vagrant-vmware-ovf ]] || { echo "Packer OVF post processor not installed. Aborting" >&2; exit 1; }

-%: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

+check: packages

+    ifeq ($(RPMCHECK),enable_stop_on_error)

+	    $(eval rpmcheck_stop_on_error = -q)

+    endif

+	@echo "Testing all RPMS ..."

+	@cd $(PHOTON_PKG_BUILDER_DIR) && \

+        $(PHOTON_PACKAGE_BUILDER) -o full \

+                -s $(PHOTON_SPECS_DIR) \

+                -r $(PHOTON_RPMS_DIR) \

+                -a $(PHOTON_SRPMS_DIR) \

+                -x $(PHOTON_SRCS_DIR) \

+                -b $(PHOTON_CHROOT_PATH) \

+                -l $(PHOTON_LOGS_DIR) \

+                -p $(PHOTON_PUBLISH_RPMS_DIR) \

+                -j $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \

+                -c $(PHOTON_BINTRAY_CONFIG) \

+                -d $(PHOTON_DIST_TAG) \

+                -n $(PHOTON_BUILD_NUMBER) \

+                -v $(PHOTON_RELEASE_VERSION) \

+                -w $(PHOTON_DATA_DIR)/pkg_info.json \

+                -g $(PHOTON_DATA_DIR)/pkg_build_options.json \

+                -u \

+                $(rpmcheck_stop_on_error) \

+                -t ${THREADS}

+

+%: check-tools $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

 	$(eval PKG_NAME = $@)

 	@echo "Building package $(PKG_NAME) ..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

@@ -507,7 +543,7 @@ check-packer-ovf-plugin:

                               -n $(PHOTON_BUILD_NUMBER) \

                               -v $(PHOTON_RELEASE_VERSION) \

                               -g $(PHOTON_DATA_DIR)/pkg_build_options.json \

-                              $(PHOTON_RPMCHECK_OPTION) \

+                              $(PHOTON_RPMCHECK_FLAGS) \

                               -l $(PHOTON_LOGS_DIR)

 $(TOOLS_BIN):

@@ -32,9 +32,6 @@ class PackageBuilder(object):

             if not returnVal:

                 raise Exception("Unable to prepare build root")

             tUtils=ToolChainUtils(self.logName,self.logPath)

-#            if isToolChainPackage:

-#                tUtils.installCoreToolChainPackages(chrootID)

-#            else:

             tUtils.installToolChain(chrootID)

         except Exception as e:

             if chrootID is not None:

@@ -87,9 +84,15 @@ class PackageBuilder(object):

     def buildPackage(self,package):

         #do not build if RPM is already built

+        #test only if the package is in the testForceRPMS with rpmCheck

+        #build only if the package is not in the testForceRPMS with rpmCheck

         if self.checkIfPackageIsAlreadyBuilt(package):

-            self.logger.info("Skipping building the package:"+package)

-            return

+            if not constants.rpmCheck:

+                self.logger.info("Skipping building the package:"+package)

+                return

+            elif constants.rpmCheck and package not in constants.testForceRPMS:

+                self.logger.info("Skipping testing the package:"+package)

+                return

         #should initialize a logger based on package name

         chrUtils = ChrootUtils(self.logName,self.logPath)

@@ -104,12 +107,13 @@ class PackageBuilder(object):

             if not os.path.isdir(destLogPath):

                 cmdUtils = CommandUtils()

                 cmdUtils.runCommandInShell("mkdir -p "+destLogPath)

-            

+

             listInstalledPackages=self.findInstalledPackages(chrootID)

-            self.logger.info("List of installed packages")

-            self.logger.info(listInstalledPackages)

             listDependentPackages=self.findBuildTimeRequiredPackages(package)

-            

+            if constants.rpmCheck and package in constants.testForceRPMS:

+                testPackages=set(constants.listMakeCheckRPMPkgtoInstall)-set(listInstalledPackages)-set([package])

+                listDependentPackages.extend(testPackages)

+

             pkgUtils = PackageUtils(self.logName,self.logPath)

             if len(listDependentPackages) != 0:

                 self.logger.info("Installing the build time dependent packages......")

@@ -117,6 +121,7 @@ class PackageBuilder(object):

                     self.installPackage(pkgUtils, pkg,chrootID,destLogPath,listInstalledPackages)

                 pkgUtils.installRPMSInAOneShot(chrootID,destLogPath)

                 self.logger.info("Finished installing the build time dependent packages......")

+

             pkgUtils.adjustGCCSpecs(package, chrootID, destLogPath)

             pkgUtils.buildRPMSForGivenPackage(package,chrootID,self.listBuildOptionPackages,self.pkgBuildOptionFile,destLogPath)

             self.logger.info("Successfully built the package:"+package)

@@ -162,3 +167,4 @@ class PackageBuilder(object):

                 if pkg in listInstalledPackages:

                     continue

                 self.installPackage(pkgUtils,pkg,chrootID,destLogPath,listInstalledPackages)

+

@@ -86,16 +86,16 @@ class PackageManager(object):

                     needToRebuild = True

             if needToRebuild:

                 self.listOfPackagesAlreadyBuilt.remove(pkg)

- 

+

         listPackagesToBuild=listPackages[:]

         for pkg in listPackages:

-            if pkg in self.listOfPackagesAlreadyBuilt:

+            if pkg in self.listOfPackagesAlreadyBuilt and not constants.rpmCheck:

                 listPackagesToBuild.remove(pkg)

-        

+

         if not self.readPackageBuildData(listPackagesToBuild):

             return False

         return True

-    

+

     def buildToolChain(self):

         try:

             tUtils=ToolChainUtils()

@@ -104,17 +104,28 @@ class PackageManager(object):

             self.logger.error("Unable to build tool chain")

             self.logger.error(e)

             raise e

-    

+

     def buildToolChainPackages(self, listBuildOptionPackages, pkgBuildOptionFile, buildThreads):

         self.buildToolChain()

         self.buildGivenPackages(constants.listToolChainPackages, buildThreads)

-        

+

+    def buildTestPackages(self, listBuildOptionPackages, pkgBuildOptionFile, buildThreads):

+        self.buildToolChain()

+        self.buildGivenPackages(constants.listMakeCheckRPMPkgtoInstall, buildThreads)

+

     def buildPackages(self,listPackages, listBuildOptionPackages, pkgBuildOptionFile, buildThreads):

         self.listBuildOptionPackages = listBuildOptionPackages

         self.pkgBuildOptionFile = pkgBuildOptionFile

-        self.buildToolChainPackages(listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

-        self.buildGivenPackages(listPackages, buildThreads)

-    

+        if constants.rpmCheck:

+            constants.rpmCheck=False

+            self.buildToolChainPackages(listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

+            self.buildTestPackages(listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

+            constants.rpmCheck=True

+            self.buildGivenPackages(listPackages, buildThreads)

+        else:

+            self.buildToolChainPackages(listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

+            self.buildGivenPackages(listPackages, buildThreads)

+

     def initializeThreadPool(self,statusEvent):

         ThreadPool.clear()

         ThreadPool.mapPackageToCycle=self.mapPackageToCycle

@@ -123,46 +134,49 @@ class PackageManager(object):

         ThreadPool.pkgBuildOptionFile=self.pkgBuildOptionFile

         ThreadPool.logger=self.logger

         ThreadPool.statusEvent=statusEvent

-        

+

     def initializeScheduler(self,statusEvent):

         Scheduler.setLog(self.logName, self.logPath)

         Scheduler.setParams(self.sortedPackageList, self.listOfPackagesAlreadyBuilt)

         Scheduler.setEvent(statusEvent)

         Scheduler.stopScheduling=False

-    

+

     def buildGivenPackages (self, listPackages, buildThreads):

+        if constants.rpmCheck:

+            alreadyBuiltRPMS=self.readAlreadyAvailablePackages()

+            listPackages=list(set(listPackages)|(set(constants.listMakeCheckRPMPkgtoInstall)-set(alreadyBuiltRPMS)))

+

         returnVal=self.calculateParams(listPackages)

         if not returnVal:

             self.logger.error("Unable to set paramaters. Terminating the package manager.")

             raise Exception("Unable to set paramaters")

-        

+

         statusEvent=threading.Event()

         self.initializeScheduler(statusEvent)

         self.initializeThreadPool(statusEvent)

-        

+

         i=0

         while i < buildThreads:

             workerName="WorkerThread"+str(i)

             ThreadPool.addWorkerThread(workerName)

             ThreadPool.startWorkerThread(workerName)

             i = i + 1

-        

+

         statusEvent.wait()

         Scheduler.stopScheduling=True

         self.logger.info("Waiting for all remaining worker threads")

         listWorkerObjs=ThreadPool.getAllWorkerObjects()

         for w in listWorkerObjs:

             w.join()

-            

+

         setFailFlag=False

         allPackagesBuilt=False

-        

         if Scheduler.isAnyPackagesFailedToBuild():

             setFailFlag=True

-        

+

         if Scheduler.isAllPackagesBuilt():

             allPackagesBuilt=True

-        

+

         if setFailFlag:

             self.logger.error("Some of the packages failed:")

             self.logger.error(Scheduler.listOfFailedPackages)

@@ -174,6 +188,6 @@ class PackageManager(object):

             else:

                 self.logger.error("Build stopped unexpectedly.Unknown error.")

                 raise Exception("Unknown error")

-        

+

         self.logger.info("Terminated")

@@ -28,6 +28,7 @@ class PackageUtils(object):

         self.rpmbuildBinary = "rpmbuild"

         self.rpmbuildBuildallOption = "-ba --clean"

         self.rpmbuildNocheckOption = "--nocheck"

+        self.rpmbuildCheckOption ="-bi --clean"

         self.rpmbuildDistOption = '--define \\\"dist %s\\\"' % constants.dist

         self.queryRpmPackageOptions = "-qa"

         self.forceRpmPackageOptions = "--force"

@@ -68,7 +69,7 @@ class PackageUtils(object):

         rpmfile=self.findRPMFileForGivenPackage(package)

         if rpmfile is None:

             self.logger.error("No rpm file found for package:"+package)

-            raise Exception("Missing rpm file")

+            raise Exception("Missing rpm file: "+package)

         rpmDestFile = self.copyRPM(rpmfile, chrootID+constants.topDirPath+"/RPMS")

         rpmFile=rpmDestFile.replace(chrootID,"")

@@ -197,10 +198,16 @@ class PackageUtils(object):

             raise e

         finally:

             if destLogPath is not None:

-                shutil.copy2(chrootLogsFilePath, destLogPath)

+                if constants.rpmCheck and package in constants.testForceRPMS and constants.specData.isCheckAvailable(package):

+                    cmd="sed -i '/^Executing(%check):/,/^Processing files:/{//!b};d' "+ chrootLogsFilePath

+                    logFile = destLogPath+"/adjustTestFile.log"

+                    returnVal = CommandUtils().runCommandInShell(cmd, logFile)

+                    testLogFile = destLogPath+"/"+package+"-test.log"

+                    shutil.copyfile(chrootLogsFilePath, testLogFile)

+                else:

+                    shutil.copy2(chrootLogsFilePath, destLogPath)

         self.logger.info("RPM build is successful")

-        arch = self.getRPMArch(listRPMFiles[0])

-       

+

         for rpmFile in listRPMFiles:

             self.copyRPM(chrootID+"/"+rpmFile, constants.rpmPath)

@@ -208,14 +215,26 @@ class PackageUtils(object):

             self.copyRPM(chrootID+"/"+srpmFile, constants.sourceRpmPath)

             srpmName = os.path.basename(srpmFile)

             package,version,release = self.findPackageInfoFromSourceRPMFile(srpmFile)

+            arch = self.getRPMArch(listRPMFiles[0])

             SourcePackageInfo.addSRPMData(package,version,release,arch,srpmName)

     def buildRPM(self,specFile,logFile,chrootCmd,package,macros):

-        rpmBuildcmd= self.rpmbuildBinary+" "+self.rpmbuildBuildallOption+" "+self.rpmbuildDistOption

-        if not constants.rpmCheck:

-            rpmBuildcmd+=" "+self.rpmbuildNocheckOption

+        rpmBuildcmd=self.rpmbuildBinary+" "+self.rpmbuildBuildallOption+" "+self.rpmbuildDistOption

+

+        if constants.rpmCheck and package in constants.testForceRPMS:

+            self.logger.info("#"*(68+2*len(package)))

+            if not constants.specData.isCheckAvailable(package):

+                self.logger.info("####### "+package+" MakeCheck is not available. Skipping MakeCheck TEST for "+package+ " #######")

+                rpmBuildcmd=self.rpmbuildBinary+" --clean"

+            else:

+                self.logger.info("####### "+package+" MakeCheck is available. Running MakeCheck TEST for "+package+ " #######")

+                rpmBuildcmd=self.rpmbuildBinary+" "+self.rpmbuildCheckOption

+            self.logger.info("#"*(68+2*len(package)))

+        else:

+           rpmBuildcmd+=" "+self.rpmbuildNocheckOption

+

         for macro in macros:

             rpmBuildcmd+=' --define \\\"%s\\\"' % macro

         rpmBuildcmd+=" "+specFile

@@ -224,10 +243,23 @@ class PackageUtils(object):

         self.logger.info("Building rpm....")

         self.logger.info(rpmBuildcmd)

         returnVal = cmdUtils.runCommandInShell(rpmBuildcmd, logFile, chrootCmd)

-        if not returnVal:

-            self.logger.error("Building rpm is failed "+specFile)

-            raise Exception("RPM Build failed")

-        

+        if constants.rpmCheck and package in constants.testForceRPMS:

+            if not constants.specData.isCheckAvailable(package):

+                constants.testLogger.info(package+" : N/A")

+            elif returnVal:

+                constants.testLogger.info(package+" : PASS")

+            else:

+                constants.testLogger.error(package+" : FAIL" )

+

+        if constants.rpmCheck:

+            if not returnVal and constants.rpmCheckStopOnError:

+                self.logger.error("Checking rpm is failed "+specFile)

+                raise Exception("RPM check failed")

+        else:

+            if not returnVal:

+                self.logger.error("Building rpm is failed "+specFile)

+                raise Exception("RPM build failed")

+

         #Extracting rpms created from log file

         logfile=open(logFile,'r')

         fileContents=logfile.readlines()

@@ -29,7 +29,7 @@ class Scheduler(object):

         Scheduler.sortedList=sortedList

         Scheduler.listOfAlreadyBuiltPackages=listOfAlreadyBuiltPackages

         for x in Scheduler.sortedList:

-            if x not in Scheduler.listOfAlreadyBuiltPackages:

+            if x not in Scheduler.listOfAlreadyBuiltPackages or x in constants.testForceRPMS:

                 Scheduler.listOfPackagesToBuild.append(x)

         Scheduler.listOfPackagesCurrentlyBuilding=[]

         Scheduler.listOfPackagesNextToBuild=[]

@@ -42,6 +42,7 @@ class Scheduler(object):

         listRequiredRPMPackages.extend(constants.specData.getRequiresAllForPackage(package))

         listRequiredPackages=[]

+

         for pkg in listRequiredRPMPackages:

             basePkg=constants.specData.getSpecName(pkg)

             if basePkg not in listRequiredPackages:

@@ -46,6 +46,7 @@ class SerializableSpecObjectsUtils(object):

             specObj.checksums=spec.getChecksums()

             specObj.listPatches=spec.getPatchNames()

             specObj.securityHardening=spec.getSecurityHardeningOption()

+            specObj.isCheckAvailable=spec.isCheckAvailable()

             for specPkg in specObj.listPackages:

 	    	if specPkg in self.mapPackageToSpec:

 		    existingObj = self.mapSerializableSpecObjects[self.mapPackageToSpec[specPkg]]

@@ -163,18 +164,22 @@ class SerializableSpecObjectsUtils(object):

                 return specName

         self.logger.error("Could not able to find "+package+" package from specs")

         raise Exception("Invalid package:"+package)

-    

+

     def isRPMPackage(self,package):

         if self.mapPackageToSpec.has_key(package):

             specName=self.mapPackageToSpec[package]

             if self.mapSerializableSpecObjects.has_key(specName):

                 return True

         return False

-    

+

     def getSecurityHardeningOption(self, package):

         specName=self.getSpecName(package)

         return self.mapSerializableSpecObjects[specName].securityHardening

+    def isCheckAvailable(self, package):

+        specName=self.getSpecName(package)

+        return self.mapSerializableSpecObjects[specName].isCheckAvailable

+

     def printAllObjects(self):

         listSpecs=self.mapSerializableSpecObjects.keys()

         for spec in listSpecs:

@@ -210,6 +210,12 @@ class Specutils(object):

     def getSecurityHardeningOption(self):

         return self.spec.globalSecurityHardening

+    def isCheckAvailable(self):

+        check=False

+        if self.spec.checkMacro is not None:

+            check=True

+        return check

+

 def main():

     spec = Specutils("/workspace1/myrepos/photon/SPECS/docker/docker.spec")

     print "packages",spec.getPackageNames()

@@ -38,6 +38,7 @@ def main():

     parser.add_option("-a",  "--source-rpm-path",  dest="sourceRpmPath",  default="../../stage/SRPMS")

     parser.add_option("-w",  "--pkginfo-file",  dest="pkgInfoFile",  default="../../common/data/pkg_info.json")

     parser.add_option("-g",  "--pkg-build-option-file",  dest="pkgBuildOptionFile",  default="../../common/data/pkg_build_options.json")

+    parser.add_option("-q",  "--rpmcheck-stop-on-error", dest="rpmCheckStopOnError",  default=False, action ="store_true")

     (options,  args) = parser.parse_args()

     cmdUtils=CommandUtils()

@@ -103,6 +104,7 @@ def main():

     logger.info("Log Path :" + options.logPath)

     logger.info("Top Dir Path :" + options.topDirPath)

     logger.info("Publish RPMS Path :" + options.publishRPMSPath)

+

     if not options.installPackage:

         logger.info("JSON File :" + options.inputJSONFile)

     else:

@@ -281,6 +283,8 @@ def buildAPackage(package, listBuildOptionPackages, pkgBuildOptionFile, buildThr

     listPackages=[]

     listPackages.append(package)

     pkgManager = PackageManager()

+    if constants.rpmCheck:

+        constants.setTestForceRPMS(listPackages[:])

     pkgManager.buildPackages(listPackages, listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

 def buildPackagesFromGivenJSONFile(inputJSONFile, buildOption, listBuildOptionPackages, pkgBuildOptionFile, logger, buildThreads):

@@ -292,6 +296,8 @@ def buildPackagesFromGivenJSONFile(inputJSONFile, buildOption, listBuildOptionPa

         listPackagesToBuild.append(str(p))

     logger.info("List of packages to build:")

     logger.info(listPackagesToBuild)

+    if constants.rpmCheck:

+        constants.setTestForceRPMS(listPackagesToBuild[:])

     pkgManager = PackageManager()

     pkgManager.buildPackages(listPackagesToBuild, listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

@@ -1,4 +1,5 @@

 from SpecData import SerializableSpecObjectsUtils

+from Logger import Logger

 class constants(object):

     specPath=""

@@ -251,6 +252,44 @@ class constants(object):

         "man-pages",

         "cpio"]

+    listMakeCheckRPMPkgtoInstall=[

+        "python2",

+        "python2-devel",

+        "python2-libs",

+        "python2-tools",

+        "libffi",

+        "python-setuptools",

+        "ca-certificates",

+        "linux",

+        "createrepo",

+        "sudo",

+        "ruby",

+        "curl",

+        "pcre-devel",

+        "boost-devel",

+        "which",

+        "go",

+        "e2fsprogs-devel",

+        "shadow",

+        "check",

+        "libacl-devel",

+        "device-mapper",

+        "wget",

+        "tar",

+        "pkg-config",

+        "git",

+        "openssl",

+        "net-tools",

+        "less",

+        "yum-metadata-parser",

+        "yum",

+        "rpm-devel",

+        "rpm",

+        "libxml2",

+        "python-xml",

+        "libacl",

+        "tzdata",

+        "Linux-PAM"]

     @staticmethod

     def initialize(options):

@@ -269,9 +308,13 @@ class constants(object):

         constants.specData.readSpecsAndConvertToSerializableObjects(constants.specPath)

         constants.pullsourcesConfig = options.pullsourcesConfig

         constants.inputRPMSPath=options.inputRPMSPath

-        constants.rpmCheck = options.rpmCheck

         constants.updateRPMMacros()

-        

+        constants.testForceRPMS=[]

+        constants.rpmCheck = options.rpmCheck

+        constants.rpmCheckStopOnError = options.rpmCheckStopOnError

+        if constants.rpmCheck:

+            constants.testLogger=Logger.getLogger("MakeCheckTest",constants.logPath)

+

     @staticmethod

     def updateRPMMacros():

         #adding distribution rpm macro

@@ -299,4 +342,8 @@ class constants(object):

         kernelsubrelease = kernelsubrelease.replace(constants.dist,"")

         if kernelsubrelease:

             kernelsubrelease = "."+kernelsubrelease

-            constants.specData.addMacro("kernelsubrelease",kernelsubrelease) 

+            constants.specData.addMacro("kernelsubrelease",kernelsubrelease)

+

+    @staticmethod

+    def setTestForceRPMS(listsPackages):

+         constants.testForceRPMS=listsPackages