@@ -96,7 +96,7 @@ packages-micro: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) g

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-                -c $(PHOTON_BINTRAY_CONFIG) \

+                -c $(PHOTON_PULLSOURCES_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

@@ -165,7 +165,7 @@ packages-minimal: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-                -c $(PHOTON_BINTRAY_CONFIG) \

+                -c $(PHOTON_PULLSOURCES_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

@@ -246,7 +246,7 @@ packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $

                 -l $(PHOTON_LOGS_DIR) \

 		-e $(PHOTON_PUBLISH_XRPMS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-                -c $(PHOTON_BINTRAY_CONFIG) \

+                -c $(PHOTON_PULLSOURCES_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

@@ -265,8 +265,8 @@ updated-packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-				-e $(PHOTON_PUBLISH_XRPMS_DIR) \

-                -c $(PHOTON_BINTRAY_CONFIG) \

+                -e $(PHOTON_PUBLISH_XRPMS_DIR) \

+                -c $(PHOTON_PULLSOURCES_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

@@ -286,7 +286,7 @@ tool-chain-stage1: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

                 -t ${THREADS} \

-                -c $(PHOTON_BINTRAY_CONFIG) \

+                -c $(PHOTON_PULLSOURCES_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

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

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

                 -t ${THREADS} \

-                -c $(PHOTON_BINTRAY_CONFIG) \

+                -c $(PHOTON_PULLSOURCES_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

@@ -321,7 +321,6 @@ packages-cached:

      $(CP) -f $(PHOTON_CACHE_PATH)/RPMS/x86_64/* $(PHOTON_RPMS_DIR_X86_64)/

 sources:

-	@echo "Pulling sources from bintray...(nothing to do)"

 	@$(MKDIR) -p $(PHOTON_SRCS_DIR)

 sources-cached:

@@ -532,8 +531,8 @@ check-packer-ovf-plugin:

                               -a $(PHOTON_SRPMS_DIR) \

                               -x $(PHOTON_SRCS_DIR) \

                               -p $(PHOTON_PUBLISH_RPMS_DIR) \

-							  -e $(PHOTON_PUBLISH_XRPMS_DIR) \

-                              -c $(PHOTON_BINTRAY_CONFIG) \

+                              -e $(PHOTON_PUBLISH_XRPMS_DIR) \

+                              -c $(PHOTON_PULLSOURCES_CONFIG) \

                               -d $(PHOTON_DIST_TAG) \

                               -n $(PHOTON_BUILD_NUMBER) \

                               -v $(PHOTON_RELEASE_VERSION) \

@@ -40,7 +40,11 @@ PHOTON_INSTALLER=$(PHOTON_INSTALLER_DIR)/photonInstaller.py

 PHOTON_SPECDEPS_DIR=$(SRCROOT)/support/SpecDeps

 PHOTON_SPECDEPS=$(PHOTON_SPECDEPS_DIR)/SpecDeps.py

 PHOTON_PACKAGE_BUILDER=$(PHOTON_PKG_BUILDER_DIR)/builder.py

-PHOTON_BINTRAY_CONFIG?=$(PHOTON_PKG_BUILDER_DIR)/pullsources.conf

+ifdef PHOTON_PULLSOURCES_CONFIG

+PHOTON_PULLSOURCES_CONFIG=$(abspath $(PHOTON_PULLSOURCES_CONFIG))

+else

+PHOTON_PULLSOURCES_CONFIG?=$(PHOTON_PKG_BUILDER_DIR)/bintray.conf

+endif

 PHOTON_PULL_PUBLISH_RPMS=$(PHOTON_PULL_PUBLISH_RPMS_DIR)/pullpublishrpms.sh

 PHOTON_PULL_PUBLISH_X_RPMS=$(PHOTON_PULL_PUBLISH_RPMS_DIR)/pullpublishXrpms.sh

 PHOTON_CLOUD_IMAGE_BUILDER=$(PHOTON_CLOUD_IMAGE_BUILDER_DIR)/cloud-image-build.sh

@@ -111,7 +111,7 @@ class PackageUtils(object):

             # Fetch/verify sources if sha1 not None.

             sha1 = constants.specData.getSHA1(package, source)

             if sha1 is not None:

-                PullSources.get(source, sha1, constants.sourcePath, constants.pullsourcesConfig)

+                PullSources.get(source, sha1, constants.sourcePath, constants.pullsourcesConfig, self.logger)

             sourcePath = cmdUtils.findFile(source,constants.sourcePath)

             if sourcePath is None or len(sourcePath) == 0:

@@ -1,11 +1,11 @@

 #! /usr/bin/python2

 #

-#    Copyright (C) 2015 VMware, Inc. All rights reserved.

+#    Copyright (C) 2015-2017 VMware, Inc. All rights reserved.

 #    pullsources.py 

-#    Allows pulling packages'sources from a bintary  

-#    repository.

+#    Allows pulling packages'sources from a source repository.

 #

 #    Author(s): Mahmoud Bassiouny (mbassiouny@vmware.com)

+#               Alexey Makhalov (amakhalov@vmware.com)

 #

 import json

@@ -25,7 +25,7 @@ def getFileHash(filepath):

         f.close()

     return sha1.hexdigest()

-def get(source, sha1, sourcesPath, configs):

+def get(source, sha1, sourcesPath, configs, logger):

     cmdUtils = CommandUtils()

     sourcePath = cmdUtils.findFile(source, sourcesPath)

     if sourcePath is not None and len(sourcePath) > 0:

@@ -34,21 +34,24 @@ def get(source, sha1, sourcesPath, configs):

         if sha1 == getFileHash(sourcePath[0]):

             # Use file from sourcesPath

             return

+        else:

+            logger.info("sha1 of "+sourcePath[0]+" does not match. "+sha1+" vs "+getFileHash(sourcePath[0]))

     configFiles=configs.split(":")

     for config in configFiles:

-        p = pullSources(config)

+        p = pullSources(config, logger)

         package_path = os.path.join(sourcesPath, source)

         try: 

             p.downloadFileHelper(source, package_path, sha1)

             return

         except Exception as e:

-            print e

+            logger.error(e)

     raise Exception("Missing source: "+source)

 class pullSources:

-    def __init__(self, conf_file):

+    def __init__(self, conf_file, logger):

         self._config = {}

+        self.logger=logger

         self.loadConfig(conf_file)

         # generate the auth

@@ -63,14 +66,9 @@ class pullSources:

     def downloadFile(self, filename, file_path):

         #form url: https://dl.bintray.com/vmware/photon_sources/1.0/<filename>.

-        url = '%s/%s/%s/%s/%s' % \

-              (self._config['baseurl'],\

-               self._config['subject'],\

-               self._config['repo'],\

-               self._config['version'],\

-               filename)

+        url = '%s/%s' % (self._config['baseurl'], filename)

-        print '%s: Downloading %s...' % (str(datetime.datetime.today()), url)

+        self.logger.info("Downloading: "+url)

         with open(file_path, 'wb') as handle:

             response = requests.get(url, auth=self._auth, stream=True)

new file mode 100644

@@ -0,0 +1,5 @@

+{

+  "baseurl":"https://dl.bintray.com/vmware/photon_sources/1.0",

+  "user":"",

+  "apikey":""

+}

@@ -190,7 +190,7 @@ def buildSourcesList(yamlDir, logger, singleFile=True):

             sourceName=listSourceNames[0]

             sha1 = constants.specData.getSHA1(package, sourceName)

             if sha1 is not None:

-                PullSources.get(sourceName, sha1, yamlDir, constants.pullsourcesConfig)

+                PullSources.get(sourceName, sha1, yamlDir, constants.pullsourcesConfig, logger)

         if not singleFile:

             yamlFile = open(yamlDir+"/"+ossname+"-"+ossversion+".yaml", "w")

deleted file mode 100644

@@ -1,8 +0,0 @@

-{

-  "baseurl":"https://dl.bintray.com",

-  "subject":"vmware",

-  "repo":"photon_sources",

-  "version":"1.0",

-  "user":"", 

-  "apikey":""

-}