From 4c2e4856ccec2017af615a58443e59630123cd61 Mon Sep 17 00:00:00 2001
From: SoonKyu Park <sk7.park@samsung.com>
Date: Tue, 12 Dec 2017 11:23:50 +0900
Subject: [PATCH] 1.job_gbs_ref_fullbuild.py : Check mount existance before
 running gbsfullbuild 2. job_gbsfullbuild_create_snapshot.py : Modify
 conditioning check of profile repo section in ks file

Change-Id: Ibda93e78a49f2b5e5c0bebd77b7c73ef2c291920
---
 job_gbs_ref_fullbuild.py            | 31 +++++++++++++++++++++++++++++++
 job_gbsfullbuild_create_snapshot.py | 10 ++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/job_gbs_ref_fullbuild.py b/job_gbs_ref_fullbuild.py
index 88d9c70..a839107 100644
--- a/job_gbs_ref_fullbuild.py
+++ b/job_gbs_ref_fullbuild.py
@@ -210,6 +210,24 @@ def __is_gbs_fullbuild_result_fail(repo,arch):
         print 'There are errors on gbs fullbuild'
         return 1
 
+def _check_mount_existance():
+    print '----start _check_mount_existance-----------------------------------'
+    umount_list = ''
+
+    cmd='mount'
+    result=subprocess.check_output(cmd,shell=True)
+    for line in result.split('\n'):
+        if line.find(BUILD_ROOT.replace('//','/')) != -1:
+            umount_list+=line.split('on ')[1].split(' type')[0]+' '
+
+    if umount_list:
+        print 'There exist mount which is not unmouted by previous gbs fullbuild job.\n and these lists are like below:%s' %umount_list
+        cmd='sudo umount '+umount_list
+        subprocess.call(cmd, stdout=sys.stdout,stderr=sys.stderr, shell=True)
+    else:
+        print 'No mount is left by gbsfullbuild'
+
+
 def _do_repo_arch_gbs_fullbuild(repo,arch):
     print '----start _do_repo_arch_gbs_fullbuild-----------------------------------'
 
@@ -252,6 +270,8 @@ def do_gbs_build():
     if not os.path.exists(gbs_ref_fullbuild_root):
         os.mkdir(gbs_ref_fullbuild_root)
 
+    _check_mount_existance()
+
     if os.path.exists(BUILD_ROOT):
         cmd = 'sudo rm -rf '+BUILD_ROOT
         subprocess.call(cmd, stdout=sys.stdout,stderr=sys.stderr, shell=True)
@@ -473,6 +493,8 @@ def main():
                              %(event['event_type'], event['project'])
         return 1
 
+    _check_mount_existance()
+    
     git_prj = event['project']
     git_branch = event['refname']
     filename = 'git-ref-mapping.xml'
@@ -535,6 +557,15 @@ def main():
 
         os.chdir(original_dir)
 
+        # TRIGGER NEXT BUILD-MONITOR
+        update_message="Succeeded"
+        if len(update_message) < 119:
+            trigger_next("BUILD-MONITOR", \
+                 {'bm_stage':'GBSFULLBUILD_SNAPSHOT',
+                  'snapshot_name':ref_profile['ref_snapshot_build_id'],
+                  'gbsfullbuild_string': update_message})
+
+        # TRIGGER NEXT GBSFULLBUILD-CREATE-SNAPSHOT
         trigger_next("gbsfullbuild-create-snapshot",\
             {'event':event,
             'obs_prj':ref_profile['obs_prj'],
diff --git a/job_gbsfullbuild_create_snapshot.py b/job_gbsfullbuild_create_snapshot.py
index 0b63cf3..3b23f1e 100755
--- a/job_gbsfullbuild_create_snapshot.py
+++ b/job_gbsfullbuild_create_snapshot.py
@@ -63,8 +63,14 @@ def prepare_trigger_data(images, build_id, path_repo, project,
 #            if ksname.find('iot-headless-2parts-armv7l-rpi3') == -1:
 #                continue
             name = ksname.replace('.ks', '')
-            kickstart=kickstart.replace('/snapshots/tizen/','/snapshots/'+gbsfullbuild_dl_postfix+'/tizen/')
-            kickstart=kickstart.replace('/snapshots/'+gbsfullbuild_dl_postfix+'/tizen/base','/snapshots/tizen/base')
+
+            ks_temp=''
+            for line in kickstart.split('\n'):
+                if line.find('snapshots/tizen') != -1 and line.find('base/') == -1:
+                    line=line.replace('/snapshots/tizen/','/snapshots/'+gbsfullbuild_dl_postfix+'/tizen/')
+                ks_temp+=line+'\n'
+            kickstart=ks_temp
+
             if download_host:
                 # replace host name
                 kickstart = re.sub('^(repo .*--baseurl=[^:]+://)[^/]+(/.*)',
-- 
2.7.4