Fix: Do not use internal url in OBS description

Change-Id: I8f4b2612fb19a5f226914a15b81021d1c45de5c6

diff --git a/job_request.py b/job_request.py
index dccba56..1849a75 100755 (executable)
--- a/job_request.py
+++ b/job_request.py
@@ -44,8 +44,8 @@ sys.setdefaultencoding('utf-8') # pylint: disable-msg=E1101
 def request_url(request_id):
     """Get request url"""
 
-    if os.getenv('OBS_URL'):
-        return '%s/request/show/%s' % (os.getenv('OBS_URL'), request_id)
+    if os.getenv('OBS_URL_EXTERNAL'):
+        return '%s/request/show/%s' % (os.getenv('OBS_URL_EXTERNAL'), request_id)
     else:
         return '%s' % (request_id)
 

diff --git a/job_rpm_buildlogs.py b/job_rpm_buildlogs.py
index 2457135..2aa63ef 100755 (executable)
--- a/job_rpm_buildlogs.py
+++ b/job_rpm_buildlogs.py
@@ -47,7 +47,7 @@ def main():
                  "name": content.get('package'),
                  "arch": content.get('arch'),
                  "status": content.get('event_type'),
-                 "repo_server": os.getenv('OBS_URL'),
+                 "repo_server": os.getenv('OBS_URL_EXTERNAL'),
                })
 
     return 0

diff --git a/job_submit.py b/job_submit.py
index 38b7e0e..0b71df6 100755 (executable)
--- a/job_submit.py
+++ b/job_submit.py
@@ -383,7 +383,7 @@ def create_project(git_url, git_project, git_tag, git_revision, build,
             'obs_target_prj': obs_target_prj,
             'git_tag': git_tag,
             'git_commit': git_revision,
-            'obs_url': os.path.join(os.getenv('OBS_URL'), \
+            'obs_url': os.path.join(os.getenv('OBS_URL_EXTERNAL'), \
                                     'project/show?project=%s' % obs_project),
             'images': []}
 

diff --git a/job_submitobs.py b/job_submitobs.py
index ad87759..8b7e1f4 100755 (executable)
--- a/job_submitobs.py
+++ b/job_submitobs.py
@@ -512,7 +512,7 @@ def main():
                 commitinfo['id'], commitinfo['subject'])
         if obs_stg_prj != obs_dst_prj:
             # submit to :build project and create a SR
-            requrl = ' %s/request/show/%s' % (os.getenv('OBS_URL'), newreq)
+            requrl = ' %s/request/show/%s' % (os.getenv('OBS_URL_EXTERNAL'), newreq)
             comment = 'A SR (Submit Request) has been triggered to submit '\
                     'the commit to OBS %s project.\n' % obs_dst_prj + \
                       comment + '\n' + '- Request URL:%s' % requrl