Separate internal gerrit hostname from public

Change-Id: I58fb35b6208eee5fe4549cff0dc16db62075396b

diff --git a/common/buildservice.py b/common/buildservice.py
index 7ef38ea..2e6e143 100755 (executable)
--- a/common/buildservice.py
+++ b/common/buildservice.py
@@ -1271,7 +1271,7 @@ class BuildService(OSC):
             print 'get_pkgrev_from_snapshot http_GET(%s) error' % u
             return None
 
-    def get_source_viewinfo(self, prj):
+    def get_source_viewinfo(self, prj, nofilename=1, parse=0):
         """
         Get source viewinfo of the project
         """

diff --git a/common/imagedata.py b/common/imagedata.py
index c9ff4bf..a6700db 100644 (file)
--- a/common/imagedata.py
+++ b/common/imagedata.py
@@ -123,6 +123,10 @@ class ImageData(object):
                 except CalledProcessError, err:
                     raise ImageDataError("Can't extract %s from %s: %s" % \
                                          (path, rpm, err))
+                # Change baseurl
+                if os.getenv('ENABLED_REPLACE_BASEURL'):
+                    content = content.replace(os.getenv('ENABLED_REPLACE_BASEURL').split(',')[0],
+                                              os.getenv('ENABLED_REPLACE_BASEURL').split(',')[1])
                 self.ksi[os.path.basename(path)] = content
             if path.endswith('.xml'):
                 try:

diff --git a/job_imager.py b/job_imager.py
index 5e20ece..0d2ac5a 100755 (executable)
--- a/job_imager.py
+++ b/job_imager.py
@@ -39,7 +39,6 @@ from random import randint
 from common.buildtrigger import trigger_info, trigger_next
 from common.utils import sync, set_permissions, Workdir
 
-
 # Returns the list of baseurls from kickstart configuration.
 def get_base_url(kickstart,buildid):
     baseurl = []
@@ -288,6 +287,8 @@ def main():
                               stderr=sys.stderr,
                               shell=True)
 
+        os.system('sudo chmod 0777 -R %s' % basedir)
+
     status = 'success'
     if ret:
         print 'Error: mic returned %d' % ret
@@ -305,6 +306,7 @@ def main():
     convert_image_dir(os.path.join(sync_src, 'images'),
                       fields['repo'], fields['name'])
     sync_status = 'success'
+
     for loop in range(2):
         if sync(sync_src, sync_dest):
             print "Retry sync %s to %s" % (sync_src, sync_dest)

diff --git a/job_request.py b/job_request.py
index 54e370f..f7fceb8 100755 (executable)
--- a/job_request.py
+++ b/job_request.py
@@ -390,7 +390,7 @@ def main():
         print 'Skipping processing of REQUEST_CREATE for prerelease project'
         return 0
 
-    gerrit = Gerrit(os.getenv('GERRIT_HOSTNAME'), os.getenv('GERRIT_USERNAME'),
+    gerrit = Gerrit(os.getenv('GERRIT_HOSTNAME_EXTERNAL'), os.getenv('GERRIT_USERNAME'),
                     os.getenv('GERRIT_SSHPORT'),
                     int(os.getenv('GERRIT_SILENT_MODE')))
 

diff --git a/job_submit.py b/job_submit.py
index 3f6d3f0..38b7e0e 100755 (executable)
--- a/job_submit.py
+++ b/job_submit.py
@@ -622,7 +622,7 @@ def main(build_type):
                 "tag": git_tag,
                 }
     submit_info['pre_created'] = []
-    url = 'ssh://%s:%s' % (os.getenv('GERRIT_HOSTNAME'),
+    url = 'ssh://%s:%s' % (os.getenv('GERRIT_HOSTNAME_EXTERNAL'),
                            os.getenv('GERRIT_SSHPORT'))
     for item in obs_target_prjs:
         enable_build = True

diff --git a/job_submitobs.py b/job_submitobs.py
index 9c35ab0..ad87759 100755 (executable)
--- a/job_submitobs.py
+++ b/job_submitobs.py
@@ -455,7 +455,7 @@ def main():
                                 "here are accepted.")
 
                 print '\n Upload _service file to replace update package to OBS'
-                url = 'ssh://%s:%s' % (os.getenv('GERRIT_HOSTNAME'),
+                url = 'ssh://%s:%s' % (os.getenv('GERRIT_HOSTNAME_EXTERNAL'),
                                     os.getenv('GERRIT_SSHPORT'))
                 gerrit_project = os.getenv('GERRIT_PROJECT')
                 # create local package