ABS: Fix infra configuration

Change-Id: Idd5a42d368fdd3227a398ede9401b876b977e2cf

diff --git a/abs/job_abs_update.py b/abs/job_abs_update.py
index 682f301..b5ded07 100755 (executable)
--- a/abs/job_abs_update.py
+++ b/abs/job_abs_update.py
@@ -69,6 +69,7 @@ def build_result_report(build_number):
     reason = None
     target = None
     branch = None
+    obs_project = None
 
     jenkins_server = Jenkins(os.getenv('JENKINS_URL'), os.getenv('JENKINS_USER'), os.getenv('JENKINS_PW'))
     build_abs = jenkins_server[os.getenv('JOB_NAME')].get_build(int(build_number))
@@ -91,6 +92,7 @@ def build_result_report(build_number):
                     reason = json.get('full_build')
                     project = json.get('event').get('GERRIT_PROJECT')
                     target = json.get('obs_project')
+                    obs_project = json.get('obs_project')
                     package = json.get('obs_package')
                     branch = json.get('branch')
 
@@ -153,8 +155,8 @@ def build_result_report(build_number):
                        'Please DO NOT Reply!')
 
     mailing_list = os.getenv('ABS_MAILINGLIST').split(',')
-    mailing_list.extend(ast.literal_eval(os.getenv('ABS_MAILINGLIST_2')).get(data.get('obs_project')).split(','))
-    mailer.add_receiver(filter(None, mailing_list))
+    mailing_list.extend(ast.literal_eval(os.getenv('ABS_MAILINGLIST_2')).get(obs_project).split(','))
+    mymail.add_receiver(filter(None, mailing_list))
 
     mymail.send_mail()
 
@@ -165,6 +167,14 @@ def main(new_rs, gerrit_name):
     if os.getenv('BUILD_RESULT_REPORT', None):
         return build_result_report(os.getenv('BUILD_RESULT_REPORT'))
 
+    if new_rs is None or new_rs == '' or gerrit_name is None or gerrit_name == '':
+        ti = trigger_info(os.getenv('TRIGGER_INFO'))
+        new_rs = ti.get('NEW_ROOTSTRAP')
+        gerrit_name = ti.get('NEW_ROOTSTRAP')
+
+    assert new_rs
+    assert new_rs.startswith('http')
+
     if gerrit_name.startswith('public_gerrit'):
         gerrit_infra = 'PUBLIC'
         gerrit_env = GerritEnv('PUBLIC_')
@@ -181,9 +191,6 @@ def main(new_rs, gerrit_name):
     new_rootstrap_url = new_rs
     trigger_arg = new_rs
 
-    assert new_rs
-    assert new_rs.startswith('http')
-
     rs_version = re.match(r'.*\/(.*-.*_[0-9.]{1,})\/.*', new_rs).group(1)
     print 'new_rs: %s' % new_rs
     print 'rs_version: %s' % rs_version 

diff --git a/job_create_sdkrootstrap.py b/job_create_sdkrootstrap.py
index ef2a568..aed3bf9 100755 (executable)
--- a/job_create_sdkrootstrap.py
+++ b/job_create_sdkrootstrap.py
@@ -272,7 +272,13 @@ def make_rs_snapshot_private(git_prj, git_cache, mygit, fields, profile, vm_imag
         #### abs update ####
         # notify remote jenkins build job
         remote_rs_url = os.path.join(profile["base_url"],profile["repo_path"],build_id,'builddata', rootstrap)
-        remote_jenkins_build_job_impl(remote_rs_url)
+        #remote_jenkins_build_job_impl(remote_rs_url)
+        dataContainer = {"NEW_ROOTSTRAP": remote_rs_url}
+        if 'public_mirror' in remote_rs_url:
+            dataContainer['GERRIT_INFRA'] = 'public_gerrit'
+        else:
+            dataContainer['GERRIT_INFRA'] = 'spin_gerrit'
+        trigger_next("UPDATE_ROOTSTRAP", dataContainer)
 
     if os.getenv('IMG_SYNC_DEST_BASE') and os.getenv('RSYNC_SNAPSHOT'):
         print os.getenv('URL_PUBLIC_REPO_BASE')