@@ -575,19 +575,14 @@ class RpmBuildTarget:

         Builder.buildPackagesForAllSpecs(Build_Config.buildThreads, Build_Config.pkgBuildType, Build_Config.pkgInfoFile, self.logger)

     def distributed_build():

-        from DistributedBuilder import DistributedBuilder

-        print("Building RPMS through kubernetes ...")

-        os.chdir(str(PurePath(curDir, "support", "package-builder")))

+        import DistributedBuilder

+        if not check_prerequesite["vixdiskutil"]:

+            vixdiskutil()

+        print("Distributed Building using kubernetes ...")

         with open(Build_Config.distributedBuildFile, 'r') as configFile:

             distributedBuildConfig = json.load(configFile)

-        distributedBuilder = DistributedBuilder(distributedBuildConfig)

-        distributedBuilder.create()

-        distributedBuilder.getLogs()

-        distributedBuilder.monitorJob()

-        distributedBuilder.copyFromNfs()

-        distributedBuilder.deleteBuild()

-        distributedBuilder.clean()

+        DistributedBuilder.main(distributedBuildConfig)

     def tool_chain_stage1(self):

         from PackageManager import PackageManager

@@ -822,13 +817,15 @@ class BuildImage:

             CheckTools.check_photon_installer()

         if not check_prerequesite["photon-stage"]:

             BuildEnvironmentSetup.photon_stage()

-        if not check_prerequesite["vixdiskutil"] and constants.buildArch == "x86_64":

+

+        local_build = not configdict['photon-build-param']['start-scheduler-server']

+        if not check_prerequesite["vixdiskutil"] and constants.buildArch == "x86_64" and local_build:

             vixdiskutil()

         rpmBuildTarget = None

         if not check_prerequesite["packages"]:

             rpmBuildTarget = RpmBuildTarget()

             rpmBuildTarget.packages()

-        if not check_prerequesite["ostree-repo"]:

+        if not check_prerequesite["ostree-repo"] and local_build:

             RpmBuildTarget.ostree_repo()

         print("Building " + self.img_name + " image")

         imagebuilder.createImage(self)

@@ -928,7 +925,7 @@ def initialize_constants():

     constants.setKatBuild(configdict["photon-build-param"].get("kat-build", False))

     Build_Config.setConfFile(configdict["additional-path"]["conf-file"])

     Build_Config.setPkgToBeCopiedConfFile(configdict.get("additional-path", {}).get("pkg-to-be-copied-conf-file"))

-    Build_Config.setDistributedBuildFile(configdict.get("additional-path", {}).get("distributed-build-option-file", PurePath(curDir, "common", "data", "distributed_build_options.json")))

+    Build_Config.setDistributedBuildFile(os.path.join(Build_Config.dataDir, "distributed_build_options.json"))

     Builder.get_packages_with_build_options(configdict['photon-build-param']['pkg-build-options'])

     Build_Config.setCommonDir(PurePath(curDir, "common", "data"))

     constants.setStartSchedulerServer(configdict["photon-build-param"]['start-scheduler-server'])

@@ -1,8 +1,5 @@

 {

     "command": "make packages SCHEDULER_SERVER=enable",

-    "kubernetesAuthorizationToken": "",

-    "kubernetes-master-ip": "",

-    "kubernetes-master-port": "6443",

     "nfs-server-ip": "",

     "nfs-server-path": "",

     "pods": 1

@@ -7,13 +7,12 @@ import json

 import subprocess

 import uuid

 import sys

+import signal

 from argparse import ArgumentParser

 from Logger import Logger

 from constants import constants

 from kubernetes import client, config, watch

 from kubernetes import stream

-import urllib3

-urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)

 class DistributedBuilder:

@@ -28,21 +27,11 @@ class DistributedBuilder:

         self.distributedBuildConfig = distributedBuildConfig

         self.buildGuid = self.getBuildGuid()

-        self.aApiClient = self.getClusterAuthorization()

+        self.aApiClient = config.load_kube_config()

         self.coreV1ApiInstance = client.CoreV1Api(self.aApiClient)

         self.batchV1ApiInstance = client.BatchV1Api(self.aApiClient)

         self.AppsV1ApiInstance = client.AppsV1Api(self.aApiClient)

-

-    def getClusterAuthorization(self):

-        aToken = self.distributedBuildConfig["kubernetesAuthorizationToken"]

-        aConfiguration = client.Configuration()

-        aConfiguration.host = "https://" + self.distributedBuildConfig["kubernetes-master-ip"] + ":" + self.distributedBuildConfig["kubernetes-master-port"]

-        aConfiguration.verify_ssl = False

-        aConfiguration.ssl_ca_cert = None

-        aConfiguration.api_key = {"authorization": "Bearer " + aToken}

-        return client.ApiClient(aConfiguration)

-

     def getBuildGuid(self):

          guid = str(uuid.uuid4()).split("-")[1]

          guid = guid.lower()

@@ -171,15 +160,16 @@ class DistributedBuilder:

            self.logger.error("Exception when calling BatchV1Api->delete_namespaced_job: %s\n" % e.reason)

     def deleteBuild(self):

-        count = 2

-        while count:

-            pod = "nfspod" + "-" + self.buildGuid

-            cmd = ['/bin/sh', '-c', 'cd /root; ls; rm -rf ' + 'build-' + self.buildGuid]

-            resp = stream.stream(self.coreV1ApiInstance.connect_get_namespaced_pod_exec, pod, 'default', command=cmd, stderr=True, stdin=False, stdout=True, tty=False)

-            self.logger.info("%s"%resp)

-            count -= 1

-

-        self.logger.info("Deleted Build Successfully")

+        self.logger.info("Removing Build folder ...")

+        pod = "nfspod" + "-" + self.buildGuid

+        cmd = ['/bin/sh', '-c', 'rm -rf ' + '/root/build-' + self.buildGuid]

+        try:

+            resp = stream.stream(self.coreV1ApiInstance.connect_get_namespaced_pod_exec, pod, 'default', command=cmd, \

+                   stderr=True, stdin=False, stdout=True, tty=False, _preload_content=False)

+            resp.run_forever(timeout=10)

+            self.logger.info("Deleted Build folder Successfully...")

+        except client.rest.ApiException as e:

+            self.logger.error("Exception when calling CoreV1Api->connect_namespaced_pod_exec: %s\n" % e.reason)

     def deleteNfsPod(self):

         try:

@@ -206,7 +196,6 @@ class DistributedBuilder:

             self.logger.error("Exception when calling AppsV1Api->delete_namespaced_deployment: %s\n" % e.reason)

     def copyToNfs(self):

-        self.createNfsPod()

         podName = "nfspod" + "-" + self.buildGuid

         while True:

             resp = self.coreV1ApiInstance.read_namespaced_pod(name=podName, namespace='default')

@@ -214,21 +203,19 @@ class DistributedBuilder:

             if status == 'Running':

                 break

-        cmd = "kubectl cp " +str( os.path.join(os.path.dirname(__file__)).replace('support/package-builder', '')) \

+        cmd = "kubectl cp " + str( os.path.join(os.path.dirname(__file__)).replace('support/package-builder', '')) \

                + " " + podName + ":/root/" + "build-" + self.buildGuid + "/photon"

         self.logger.info("%s"%cmd)

         process = subprocess.Popen("%s" %cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

         retval = process.wait()

         if retval == 0:

             self.logger.info("kubectl cp successfull.")

-            self.deleteNfsPod()

         else:

             self.logger.error("kubectl cp failed.")

             self.clean()

             sys.exit(1)

     def copyFromNfs(self):

-        self.createNfsPod()

         podName = "nfspod" + "-" + self.buildGuid

         while True:

             resp = self.coreV1ApiInstance.read_namespaced_pod(name=podName, namespace='default')

@@ -244,7 +231,6 @@ class DistributedBuilder:

             self.logger.info("kubectl cp successfull.")

         else:

             self.logger.error("kubectl cp failed.")

-            self.deleteBuild()

             self.clean()

             sys.exit(1)

@@ -279,12 +265,19 @@ class DistributedBuilder:

             self.logger.error(e)

         self.logger.info("pod terminated")

+    def signal_handler(self, signal, frame):

+        self.logger.info("SIGINT received")

+        self.logger.info("Stopping Build ...")

+        self.clean()

+        sys.exit(0)

+

     def clean(self):

         self.logger.info("-"*45)

         self.logger.info("")

         self.logger.info("Cleaning up ...")

-        self.deleteMasterJob()

+        self.deleteBuild()

         self.deleteNfsPod()

+        self.deleteMasterJob()

         self.deleteMasterService()

         self.deleteDeployment()

         self.deletePersistentVolumeClaim()

@@ -295,11 +288,21 @@ class DistributedBuilder:

         self.logger.info("")

         self.createPersistentVolume()

         self.createPersistentVolumeClaim()

+        self.createNfsPod()

         self.copyToNfs()

         self.createMasterService()

         self.createMasterJob()

         self.createDeployment()

+def main(distributedBuildConfig):

+    distributedBuilder = DistributedBuilder(distributedBuildConfig)

+    signal.signal(signal.SIGINT, distributedBuilder.signal_handler)

+    distributedBuilder.create()

+    distributedBuilder.getLogs()

+    distributedBuilder.monitorJob()

+    distributedBuilder.copyFromNfs()

+    distributedBuilder.clean()

+

 if __name__ == "__main__":

     parser = ArgumentParser()

@@ -310,14 +313,6 @@ if __name__ == "__main__":

     options = parser.parse_args()

     constants.setLogPath(options.logPath)

     constants.setLogLevel(options.logLevel)

-

-    with open(os.path.join(os.path.dirname(__file__), options.distributedBuildOptionFile), 'r') as configFile:

+    with open(os.path.join(os.path.dirname(__file__), options.distributedBuildFile), 'r') as configFile:

         distributedBuildConfig = json.load(configFile)

-

-    distributedBuilder = DistributedBuilder(distributedBuildConfig)

-    distributedBuilder.create()

-    distributedBuilder.getLogs()

-    distributedBuilder.monitorJob()

-    distributedBuilder.copyFromNfs()

-    distributedBuilder.deleteBuild()

-    distributedBuilder.clean()

+    main(distributedBuildConfig)

@@ -22,11 +22,19 @@ spec:

         - name: sys

           mountPath: /sys

           readOnly: false

+        - name: dev

+          mountPath: /dev

+          readOnly: false

         workingDir: /root/photon

         command: ["/bin/bash"]

-        args: ["-c","tdnf remove -y toybox && \

-                     tdnf install -y build-essential createrepo texinfo wget sudo \

-                     findutils python3-pip git && \

+        args: ["-c","tdnf install -y build-essential createrepo texinfo wget sudo \

+                     fuse gdbm gptfdisk grub2 grub2-efi grub2-lang grub2-pc \

+                     qemu-img kmod kpartx dosfstools efibootmgr ncurses e2fsprogs \

+                     python3 python3-asn1crypto python3-certifi python3-cffi \

+                     python3-chardet python3-cryptography python3-curses \

+                     python3-idna python3-packaging python3-pyasn1 python3-pycparser \

+                     python3-pyOpenSSL python3-pyparsing python3-requests python3-six \

+                     util-linux rpm glibc-iconv findutils python3-pip git && \

                      pip3 install flask requests pyOpenSSL docker==2.3.0 && \

                      chmod 755 /sys "]

       volumes:

@@ -36,4 +44,7 @@ spec:

       - name: sys

         hostPath:

           path: /sys

+      - name: dev

+        hostPath:

+          path: /dev

   backoffLimit: 1