From: jinxiao <jin.xiao@samsung.com>
Date: Tue, 21 May 2019 00:57:44 +0000 (+0800)
Subject: modify cases and repalce with public repo
X-Git-Tag: submit/devel/20190730.074558~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfcf2625263cc8cf8b454a34f3b5d9905b1f46b5;p=tools%2Fitest-cases-mic.git

modify cases and repalce with public repo

Change-Id: I5c17a06cd7dcfa942e6947cd8603aabda4313de6
---

diff --git a/cases/create/func_cases/mic_cr_auto_fs.case b/cases/create/func_cases/mic_cr_auto_fs.case
index 6e74f4d..fce7996 100755
--- a/cases/create/func_cases/mic_cr_auto_fs.case
+++ b/cases/create/func_cases/mic_cr_auto_fs.case
@@ -23,7 +23,7 @@ assert img_file in manifest['fs']['image_files']
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr auto handset_blackbay_fs.ks --logfile=log.file
+sudo mic -d -v cr auto -A=i686 handset_blackbay_fs.ks --logfile=log.file
 grep "Finished" log.file
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/func_cases/mic_cr_auto_fs_d_v_i.case b/cases/create/func_cases/mic_cr_auto_fs_d_v_i.case
index 746f75a..cf63fc4 100755
--- a/cases/create/func_cases/mic_cr_auto_fs_d_v_i.case
+++ b/cases/create/func_cases/mic_cr_auto_fs_d_v_i.case
@@ -23,7 +23,7 @@ assert img_file in manifest['fs']['image_files']
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic cr auto handset_blackbay_fs_d_v_i.ks --logfile=log.file
+sudo mic cr auto -A=i686 handset_blackbay_fs_d_v_i.ks --logfile=log.file
 grep "Finished" log.file
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/func_cases/mic_cr_auto_fs_parameter_run_script.case b/cases/create/func_cases/mic_cr_auto_fs_parameter_run_script.case
index 2335482..1707cb2 100755
--- a/cases/create/func_cases/mic_cr_auto_fs_parameter_run_script.case
+++ b/cases/create/func_cases/mic_cr_auto_fs_parameter_run_script.case
@@ -21,7 +21,7 @@ assert img_file in manifest['fs']['image_files']
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr auto handset_blackbay_fs.ks --logfile=log.file --run_script="cd ./mic-output; cp manifest.json run_script.json"
+sudo mic -d -v cr auto -A=i686 handset_blackbay_fs.ks --logfile=log.file --run_script="cd ./mic-output; cp manifest.json run_script.json"
 grep "Finished" log.file
 test -f ./mic-output/run_script.json
 sudo $losetup_path -a
diff --git a/cases/create/func_cases/mic_cr_auto_loop.case b/cases/create/func_cases/mic_cr_auto_loop.case
index 3a69ef8..51ed03f 100755
--- a/cases/create/func_cases/mic_cr_auto_loop.case
+++ b/cases/create/func_cases/mic_cr_auto_loop.case
@@ -11,7 +11,7 @@ which called magic line, and magic line in this ks file is:
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr auto handset_blackbay.ks --logfile=log.file
+sudo mic -d -v cr auto -A=i686 handset_blackbay.ks --logfile=log.file
 grep "Finished" log.file
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/func_cases/mic_cr_auto_loop_cp_tpk_error.case b/cases/create/func_cases/mic_cr_auto_loop_cp_tpk_error.case
index ea3e32e..325b076 100755
--- a/cases/create/func_cases/mic_cr_auto_loop_cp_tpk_error.case
+++ b/cases/create/func_cases/mic_cr_auto_loop_cp_tpk_error.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-(! sudo mic -d -v cr auto handset_blackbay.ks --logfile=log.file --tpk_install="./")
+(! sudo mic -d -v cr auto -A=i686 handset_blackbay.ks --logfile=log.file --tpk_install="./")
 grep "Not all files in the path" log.file
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/func_cases/mic_cr_auto_loop_http_tpk.case b/cases/create/func_cases/mic_cr_auto_loop_http_tpk.case
index 0c5bda3..d9195d4 100755
--- a/cases/create/func_cases/mic_cr_auto_loop_http_tpk.case
+++ b/cases/create/func_cases/mic_cr_auto_loop_http_tpk.case
@@ -10,7 +10,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr auto handset_blackbay_http_tpk_repo.ks --logfile=log.file --tpk_install="./tpk"
+sudo mic -d -v cr auto -A=i686 handset_blackbay_http_tpk_repo.ks --logfile=log.file --tpk_install="./tpk"
 grep "Finished" log.file
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/func_cases/mic_cr_auto_loop_multi_mic_run.case b/cases/create/func_cases/mic_cr_auto_loop_multi_mic_run.case
index 5ac0b4d..d99d185 100755
--- a/cases/create/func_cases/mic_cr_auto_loop_multi_mic_run.case
+++ b/cases/create/func_cases/mic_cr_auto_loop_multi_mic_run.case
@@ -8,8 +8,8 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr auto handset_blackbay.ks --logfile=log1.file
-sudo mic -d -v cr auto handset_blackbay.ks --logfile=log2.file --cachedir=/var/tmp/mic/cache2 -o my-mic-output
+sudo mic -d -v cr auto -A=i686 handset_blackbay.ks --logfile=log1.file
+sudo mic -d -v cr auto -A=i686 handset_blackbay.ks --logfile=log2.file --cachedir=/var/tmp/mic/cache2 -o my-mic-output
 grep "Finished" log1.file
 grep "Finished" log2.file
 sudo $losetup_path -a
diff --git a/cases/create/func_cases/mic_cr_auto_loop_package_constPtr.case b/cases/create/func_cases/mic_cr_auto_loop_package_constPtr.case
index 0afa3ae..03e2724 100755
--- a/cases/create/func_cases/mic_cr_auto_loop_package_constPtr.case
+++ b/cases/create/func_cases/mic_cr_auto_loop_package_constPtr.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr auto handset_blackbay_package_constPtr.ks --logfile=log.file
+sudo mic -d -v cr auto -A=i686 handset_blackbay_package_constPtr.ks --logfile=log.file
 grep "Finished" log.file
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/func_cases/mic_cr_auto_loop_partition_expand.case b/cases/create/func_cases/mic_cr_auto_loop_partition_expand.case
index 6f0f5eb..e05f35c 100755
--- a/cases/create/func_cases/mic_cr_auto_loop_partition_expand.case
+++ b/cases/create/func_cases/mic_cr_auto_loop_partition_expand.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr auto handset_blackbay_partition_expand.ks --logfile=log.file
+sudo mic -d -v cr auto -A=i686 handset_blackbay_partition_expand.ks --logfile=log.file
 grep "Initial partition size expanded" log.file
 grep "Finished" log.file
 sudo $losetup_path -a
diff --git a/cases/create/func_cases/mic_cr_auto_loop_rpm_debug.case b/cases/create/func_cases/mic_cr_auto_loop_rpm_debug.case
index 9b9c4d0..a4cb616 100755
--- a/cases/create/func_cases/mic_cr_auto_loop_rpm_debug.case
+++ b/cases/create/func_cases/mic_cr_auto_loop_rpm_debug.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr auto handset_blackbay.ks --logfile=log.file --rpm-debug
+sudo mic -d -v cr auto -A=i686 handset_blackbay.ks --logfile=log.file --rpm-debug
 grep "Finished" log.file
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/func_cases/mic_cr_fs_inc-src_cache-dir_arch_logfile_armv7l.case b/cases/create/func_cases/mic_cr_fs_inc-src_cache-dir_arch_logfile_armv7l.case
index 5acfc60..0576f27 100755
--- a/cases/create/func_cases/mic_cr_fs_inc-src_cache-dir_arch_logfile_armv7l.case
+++ b/cases/create/func_cases/mic_cr_fs_inc-src_cache-dir_arch_logfile_armv7l.case
@@ -13,7 +13,7 @@ enforce_path=$(sudo which setenforce || true)
 if [ ! -z $enforce_path ];then
     sudo $enforce_path 0 || true
 fi
-sudo mic -d -v cr  fs armv7l.ks --include-src --logfile=fs_src.log -k fs_cache -A armv7l -o my_output
+sudo mic --non-interactive -d -v cr fs armv7l.ks --include-src --logfile=fs_src.log -k fs_cache -A armv7l -o my_output
 test -d ./my_output
 test -f fs_src.log
 grep "Finished" fs_src.log
diff --git a/cases/create/func_cases/mic_cr_fs_inc-src_cp-knl_cache-dir_ia32.case b/cases/create/func_cases/mic_cr_fs_inc-src_cp-knl_cache-dir_ia32.case
index 30b8345..cf97cda 100755
--- a/cases/create/func_cases/mic_cr_fs_inc-src_cp-knl_cache-dir_ia32.case
+++ b/cases/create/func_cases/mic_cr_fs_inc-src_cp-knl_cache-dir_ia32.case
@@ -4,14 +4,14 @@
         --cachedir will store all download packages to the specified directory, default is /var/tmp/mic/cache
     </summary>
     <fixtures>
-        <copy src="ks_files/handset_blackbay.ks" />
+        <copy src="ks_files/ivi.ks" />
     </fixtures>
     <steps>
         <![CDATA[
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr fs handset_blackbay.ks --include-src --copy-kernel --cachedir=./mic-cache  --logfile=log.file
+sudo mic -d -v cr fs -A=i686 ivi.ks --include-src --copy-kernel --cachedir=./mic-cache  --logfile=log.file
 grep "Finished" log.file
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
@@ -19,11 +19,11 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     echo "Number of loop devices is not the same with previous number."
     exit 1
 fi
-ls -l ./mic-output | grep 'handset_blackbay.*-vmlinuz-*'
+ls -l ./mic-output | grep 'ivi.*vm.*'
 test -d mic-cache/
-ls -l mic-cache/packages/Tizen-base | grep rpm
-ls ./mic-output | grep "handset_blackbay-.*[0-9]$"
-CH_PATH=`ls ./mic-output | grep "handset_blackbay-.*[0-9]$"`
+ls -l mic-cache/packages/base | grep rpm
+ls ./mic-output | grep "ivi-.*[0-9]$"
+CH_PATH=`ls ./mic-output | grep "ivi-.*[0-9]$"`
 cd ./mic-output
 echo $CH_PATH
 ]]>
diff --git a/cases/create/func_cases/mic_cr_loop_check-pkgs_tmpfs_ia32.case b/cases/create/func_cases/mic_cr_loop_check-pkgs_tmpfs_ia32.case
index 50fa4ac..65b850a 100755
--- a/cases/create/func_cases/mic_cr_loop_check-pkgs_tmpfs_ia32.case
+++ b/cases/create/func_cases/mic_cr_loop_check-pkgs_tmpfs_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --tmpfs --check-pkgs=bash,rpm --logfile=handset1.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --tmpfs --check-pkgs=bash,rpm --logfile=handset1.log
 
 test -f handset1.log
 
@@ -21,7 +21,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
 fi
 test -f ./mic-output/platform.img
 
-sudo mic -d -v cr loop handset_blackbay.ks --check-pkgs=bashrr --logfile=handset2.log 2>&1 | tee handset2.log || true
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --check-pkgs=bashrr --logfile=handset2.log 2>&1 | tee handset2.log || true
 grep "Packages absent in image: bashrr" handset2.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/func_cases/mic_cr_loop_compress_local-pkgs_record-pkgs_pack-to_armv7l.case b/cases/create/func_cases/mic_cr_loop_compress_local-pkgs_record-pkgs_pack-to_armv7l.case
index ba8ebba..8e66809 100755
--- a/cases/create/func_cases/mic_cr_loop_compress_local-pkgs_record-pkgs_pack-to_armv7l.case
+++ b/cases/create/func_cases/mic_cr_loop_compress_local-pkgs_record-pkgs_pack-to_armv7l.case
@@ -13,7 +13,7 @@ enforce_path=$(sudo which setenforce || true)
 if [ ! -z $enforce_path ];then
     sudo $enforce_path 0 || true
 fi
-sudo mic -d -v cr loop armv7l.ks \
+sudo mic --non-interactive -d -v cr loop -A=armv7l armv7l.ks \
   --local-pkgs-path=./rpm \
   --record-pkgs=name,content,license,vcs \
   --taring-to=@NAME@.tar \
diff --git a/cases/create/func_cases/mic_cr_loop_config_cmpress_runtime_ia32.case b/cases/create/func_cases/mic_cr_loop_config_cmpress_runtime_ia32.case
index 1f8deb5..e00ea91 100755
--- a/cases/create/func_cases/mic_cr_loop_config_cmpress_runtime_ia32.case
+++ b/cases/create/func_cases/mic_cr_loop_config_cmpress_runtime_ia32.case
@@ -11,7 +11,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks \
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks \
   --config=mic.conf \
   --compress-image=bz2 \
   --runtime=bootstrap \
@@ -27,7 +27,7 @@ grep 'Start mic in bootstrap' mic1.log
 sudo rm mic1.log
 sudo test -d ./my_mic-output
 sudo test -e ./my_mic-output/platform.img.bz2
-sudo mic -d -v cr loop handset_blackbay.ks --outdir=out2  --logfile=mic2.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --outdir=out2  --logfile=mic2.log
 grep "Finished" mic2.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/func_cases/mic_cr_loop_cpio.case b/cases/create/func_cases/mic_cr_loop_cpio.case
index 0a37cc2..84be6cf 100755
--- a/cases/create/func_cases/mic_cr_loop_cpio.case
+++ b/cases/create/func_cases/mic_cr_loop_cpio.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop armv7l_cpio.ks -o out1 --logfile=mic1.log
+sudo mic --non-interactive -d -v cr loop -A=armv7l armv7l_cpio.ks -o out1 --logfile=mic1.log
 grep -i 'Finished' mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/func_cases/mic_cr_loop_logfile_conf_shrink_release_pkgmgr_armv7l.case b/cases/create/func_cases/mic_cr_loop_logfile_conf_shrink_release_pkgmgr_armv7l.case
index 1382338..ef558a8 100755
--- a/cases/create/func_cases/mic_cr_loop_logfile_conf_shrink_release_pkgmgr_armv7l.case
+++ b/cases/create/func_cases/mic_cr_loop_logfile_conf_shrink_release_pkgmgr_armv7l.case
@@ -16,7 +16,7 @@ enforce_path=$(sudo which setenforce || true)
 if [ ! -z $enforce_path ];then
     sudo $enforce_path 0 || true
 fi
-sudo mic -d -v cr loop armv7l.ks --logfile=/custome/arm.log -c mic.conf --shrink --release=tizen-2.2_20130719.3 --pkgmgr=zypp
+sudo mic --non-interactive -d -v cr loop -A=armv7l armv7l.ks --logfile=/custome/arm.log -c mic.conf --shrink --release=tizen-2.2_20130719.3 --pkgmgr=zypp
 
 sudo test -f /custome/arm.log
 
diff --git a/cases/create/func_cases/mic_cr_loop_run_script.case b/cases/create/func_cases/mic_cr_loop_run_script.case
index e8ec820..2ccb138 100755
--- a/cases/create/func_cases/mic_cr_loop_run_script.case
+++ b/cases/create/func_cases/mic_cr_loop_run_script.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay_runscript.ks -o out1 --logfile=mic1.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay_runscript.ks -o out1 --logfile=mic1.log
 grep -i 'Finished' mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/func_cases/mic_cr_loop_shrink_outdir_logfile_pkgmgr_ia32.case b/cases/create/func_cases/mic_cr_loop_shrink_outdir_logfile_pkgmgr_ia32.case
index 624ccdf..9eb4525 100755
--- a/cases/create/func_cases/mic_cr_loop_shrink_outdir_logfile_pkgmgr_ia32.case
+++ b/cases/create/func_cases/mic_cr_loop_shrink_outdir_logfile_pkgmgr_ia32.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks -o out1 --pkgmgr=zypp  --logfile=mic1.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -o out1 --pkgmgr=zypp  --logfile=mic1.log
 
 grep 'Finished' mic1.log
 
@@ -20,7 +20,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
 fi
 test -f ./out1/platform.img
 
-sudo mic -d -v cr loop handset_blackbay.ks -o out2 --shrink  --logfile=mic2.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -o out2 --shrink  --logfile=mic2.log
 
 grep 'Finished' mic2.log
 
diff --git a/cases/create/func_cases/mic_cr_qcow_check-pkgs_tmpfs_ia32.case b/cases/create/func_cases/mic_cr_qcow_check-pkgs_tmpfs_ia32.case
index cc11876..877cc00 100755
--- a/cases/create/func_cases/mic_cr_qcow_check-pkgs_tmpfs_ia32.case
+++ b/cases/create/func_cases/mic_cr_qcow_check-pkgs_tmpfs_ia32.case
@@ -11,7 +11,7 @@ sudo $losetup_path -a
 
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 
-sudo mic -d -v cr qcow qcow_image.ks --tmpfs --check-pkgs=bash,rpm --logfile=qcow1.log -k /home/build/mic-tmp-cache
+sudo mic -d -v cr qcow -A=i686 qcow_image.ks --tmpfs --check-pkgs=bash,rpm --logfile=qcow1.log -k /home/build/mic-tmp-cache
 
 # use '-k /home/build/mic-tmp-cache', because directory '/home/build/' has larger space, if
 # use default cache dir, mic will throw error 'Failed to umount /var/***/install_root' on
@@ -33,7 +33,7 @@ test -f ./mic-output/emulimg-3.0.img
 
 file ./mic-output/emulimg-3.0.img | grep -i "QCOW"
 
-sudo mic -d -v cr qcow qcow_image.ks --check-pkgs=bashrr --logfile=qcow2.log -k /home/build/mic-tmp-cache 2>&1 | tee qcow2.log || true
+sudo mic -d -v cr qcow -A=i686 qcow_image.ks --check-pkgs=bashrr --logfile=qcow2.log -k /home/build/mic-tmp-cache 2>&1 | tee qcow2.log || true
 
 grep "Packages absent in image: bashrr" qcow2.log
 
diff --git a/cases/create/func_cases/mic_cr_qcow_config_runtime_ia32.case b/cases/create/func_cases/mic_cr_qcow_config_runtime_ia32.case
index 953101b..5f9a710 100755
--- a/cases/create/func_cases/mic_cr_qcow_config_runtime_ia32.case
+++ b/cases/create/func_cases/mic_cr_qcow_config_runtime_ia32.case
@@ -18,7 +18,7 @@ loop_used_before=$(sudo $losetup_path -a | wc -l)
 sed -i 's!^\(tmpdir=\).*!\1 /home/build/mic/tmp!g' mic.conf
 sed -i 's!^\(rootdir=\).*!\1 /home/build/mic-bootstrap!g' mic.conf
 
-sudo mic -d -v cr qcow qcow_image.ks \
+sudo mic -d -v cr qcow -A=i686 qcow_image.ks \
   --config=mic.conf \
   --runtime=bootstrap \
   --logfile=mic.log \
diff --git a/cases/create/func_cases/mic_cr_qcow_local-pkgs_record-pkgs.case b/cases/create/func_cases/mic_cr_qcow_local-pkgs_record-pkgs.case
index 01b078d..ee43f79 100755
--- a/cases/create/func_cases/mic_cr_qcow_local-pkgs_record-pkgs.case
+++ b/cases/create/func_cases/mic_cr_qcow_local-pkgs_record-pkgs.case
@@ -19,7 +19,7 @@ if [ ! -z $enforce_path ];then
     sudo $enforce_path 0 || true
 fi
 
-sudo mic -d -v cr qcow qcow_image.ks \
+sudo mic -d -v cr qcow -A=i686 qcow_image.ks \
   --local-pkgs-path=./rpm \
   --record-pkgs=name,content,license,vcs \
   --taring-to=@NAME@.tar.gz \
diff --git a/cases/create/func_cases/mic_cr_qcow_logfile_conf_release_pkgmgr.case b/cases/create/func_cases/mic_cr_qcow_logfile_conf_release_pkgmgr.case
index 36ca9cc..9e0d0b0 100755
--- a/cases/create/func_cases/mic_cr_qcow_logfile_conf_release_pkgmgr.case
+++ b/cases/create/func_cases/mic_cr_qcow_logfile_conf_release_pkgmgr.case
@@ -27,7 +27,7 @@ fi
 sed -i 's!^\(tmpdir=\).*!\1 /home/build/mic/tmp!g' mic.conf
 sed -i 's!^\(rootdir=\).*!\1 /home/build/mic-bootstrap!g' mic.conf
 
-sudo mic -d -v cr qcow qcow_image.ks --logfile=/custome/arm.log -c mic.conf --release=tizen-2.2_20130719.3 --pkgmgr=zypp -k /home/build/mic-tmp-cache
+sudo mic -d -v cr qcow -A=i686 qcow_image.ks --logfile=/custome/arm.log -c mic.conf --release=tizen-2.2_20130719.3 --pkgmgr=zypp -k /home/build/mic-tmp-cache
 
 # use '-k /home/build/mic-tmp-cache', because directory '/home/build/' has larger space, if
 # use default cache dir, mic will throw error 'Failed to umount /var/***/install_root' on
diff --git a/cases/create/func_cases/mic_cr_scriptlet_error.case b/cases/create/func_cases/mic_cr_scriptlet_error.case
index 219d96d..ede21be 100755
--- a/cases/create/func_cases/mic_cr_scriptlet_error.case
+++ b/cases/create/func_cases/mic_cr_scriptlet_error.case
@@ -14,7 +14,7 @@ losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 #zypp pkg manager 
-(! sudo mic -d -v cr loop scriptlet_error.ks --logfile=./log/handset.log)
+(! sudo mic -d -v cr loop -A=i686 scriptlet_error.ks --logfile=./log/handset.log)
 grep 'scriptlet errors occurred' ./log/handset.log
 grep 'The error install package info' ./log/handset.log
 sudo $losetup_path -a
diff --git a/cases/create/mixed_cases/check_install_packages_number_display.case b/cases/create/mixed_cases/check_install_packages_number_display.case
index 67c1c7a..6bd6ef1 100755
--- a/cases/create/mixed_cases/check_install_packages_number_display.case
+++ b/cases/create/mixed_cases/check_install_packages_number_display.case
@@ -13,7 +13,7 @@ installing package, before it shows error log 'install ....[15/14]'
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic cr loop handset_blackbay.ks --logfile=./log/handset.log
+sudo mic cr loop -A=i686 handset_blackbay.ks --logfile=./log/handset.log
 test -f ./log/handset.log
 grep 'Finished' ./log/handset.log
 sudo $losetup_path -a
diff --git a/cases/create/mixed_cases/mic_cr_auto_with_encoded_password.case b/cases/create/mixed_cases/mic_cr_auto_with_encoded_password.case
index 31b72e7..51bb7c2 100755
--- a/cases/create/mixed_cases/mic_cr_auto_with_encoded_password.case
+++ b/cases/create/mixed_cases/mic_cr_auto_with_encoded_password.case
@@ -8,6 +8,11 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
+ip=$(python -c "import socket;s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM);s.connect(('8.8.8.8', 80));print s.getsockname()[0]")
+echo $ip
+host_ip=$(grep "LOCAL_HOST_IP" /home/build/tools-tester.d/servers-local.conf | cut -d':' -f 2)
+echo $host_ip
+sed -i "s/localhost/$host_ip/g" handset_blackbay_with_encoded_passwd.ks
 sudo mic -d -v cr auto handset_blackbay_with_encoded_passwd.ks --logfile=log.file
 grep "Finished" log.file
 sudo $losetup_path -a
diff --git a/cases/create/mixed_cases/mic_cr_auto_with_separate_password.case b/cases/create/mixed_cases/mic_cr_auto_with_separate_password.case
index 3b2be0b..50c790a 100755
--- a/cases/create/mixed_cases/mic_cr_auto_with_separate_password.case
+++ b/cases/create/mixed_cases/mic_cr_auto_with_separate_password.case
@@ -7,6 +7,11 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
+ip=$(python -c "import socket;s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM);s.connect(('8.8.8.8', 80));print s.getsockname()[0]")
+echo ip
+host_ip=$(grep "LOCAL_HOST_IP" /home/build/tools-tester.d/servers-local.conf | cut -d':' -f 2)
+echo host_ip
+sed -i "s/localhost/$host_ip/g" handset_blackbay_with_separate_passwd.ks
 sudo mic -d -v cr auto handset_blackbay_with_separate_passwd.ks --logfile=log.file
 grep "Finished" log.file
 (! grep -i 'pass@,:%' log.file)
diff --git a/cases/create/mixed_cases/mic_cr_auto_with_un-encoded_password.case b/cases/create/mixed_cases/mic_cr_auto_with_un-encoded_password.case
index 443f1af..7f7a402 100755
--- a/cases/create/mixed_cases/mic_cr_auto_with_un-encoded_password.case
+++ b/cases/create/mixed_cases/mic_cr_auto_with_un-encoded_password.case
@@ -7,6 +7,11 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
+ip=$(python -c "import socket;s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM);s.connect(('8.8.8.8', 80));print s.getsockname()[0]")
+echo ip
+host_ip=$(grep "LOCAL_HOST_IP" /home/build/tools-tester.d/servers-local.conf | cut -d':' -f 2)
+echo host_ip
+sed -i "s/localhost/$host_ip/g" handset_blackbay_with_passwd.ks
 sudo mic -d -v cr auto handset_blackbay_with_passwd.ks --logfile=log.file
 grep "Finished" log.file
 grep -i '123456' log.file && exit1
diff --git a/cases/create/mixed_cases/mic_cr_check_env.case b/cases/create/mixed_cases/mic_cr_check_env.case
index b07ada2..cee3fe0 100755
--- a/cases/create/mixed_cases/mic_cr_check_env.case
+++ b/cases/create/mixed_cases/mic_cr_check_env.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop env_section.ks --logfile=mic.log
+sudo mic -d -v cr loop -A=i686 env_section.ks --logfile=mic.log
 grep 'Finished' mic.log
 grep 'VALUE1 = 0x1000' mic.log
 grep 'VALUE2 = "value"' mic.log
diff --git a/cases/create/mixed_cases/mic_cr_fs_bootstrap_check_chroot.case b/cases/create/mixed_cases/mic_cr_fs_bootstrap_check_chroot.case
index 1d7153c..27fae28 100755
--- a/cases/create/mixed_cases/mic_cr_fs_bootstrap_check_chroot.case
+++ b/cases/create/mixed_cases/mic_cr_fs_bootstrap_check_chroot.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr fs handset_blackbay.ks --logfile=./log/handset.log --runtime=bootstrap
+sudo mic -d -v cr fs -A=i686 handset_blackbay.ks --logfile=./log/handset.log --runtime=bootstrap
 test -f ./log/handset.log
 grep 'Finished' ./log/handset.log
 sudo $losetup_path -a
diff --git a/cases/create/mixed_cases/mic_cr_fs_check_high_version_rpm_installed.case b/cases/create/mixed_cases/mic_cr_fs_check_high_version_rpm_installed.case
index 9f5b444..4d49d8c 100755
--- a/cases/create/mixed_cases/mic_cr_fs_check_high_version_rpm_installed.case
+++ b/cases/create/mixed_cases/mic_cr_fs_check_high_version_rpm_installed.case
@@ -1,14 +1,14 @@
 <testcase>
-    <summary>there are two bash rpms in the repo, one is bash4.1, the other one is bash4.3, bash 4.3 should be installed</summary>
+    <summary>there are two bash rpms in the repo, one is 3.1-8, the other one is 3.1-6, filesystem 3.1-8 should be installed</summary>
     <fixtures>
-        <copy src="ks_files/handset_blackbay.ks" />
+        <copy src="ks_files/handset_blackbay_high_version.ks" />
     </fixtures>
     <steps>
         <![CDATA[
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr fs handset_blackbay.ks --logfile=mic.log
+sudo mic -d -v cr fs -A=i686 handset_blackbay_high_version.ks --logfile=mic.log
 grep 'Finished' mic.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
@@ -18,7 +18,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
 fi
 hand_dir=$(ls mic-output | grep 'handset_blackbay')
 test -d mic-output/$hand_dir
-sudo chroot  mic-output/$hand_dir rpm -q bash | grep 4.3
+sudo chroot  mic-output/$hand_dir rpm -q filesystem | grep 3.1-8
         ]]>
     </steps>
     <teardown>
diff --git a/cases/create/mixed_cases/mic_cr_fs_obsolete_pkg_test.case b/cases/create/mixed_cases/mic_cr_fs_obsolete_pkg_test.case
index 6568885..0879227 100755
--- a/cases/create/mixed_cases/mic_cr_fs_obsolete_pkg_test.case
+++ b/cases/create/mixed_cases/mic_cr_fs_obsolete_pkg_test.case
@@ -24,7 +24,7 @@
     losetup_path=$(sudo which losetup)
     sudo $losetup_path -a
     loop_used_before=$(sudo $losetup_path -a | wc -l)
-    sudo mic -d -v cr fs obsolete_test_two.ks --logfile=mic1.log
+    sudo mic -d -v cr fs -A=x86_64 obsolete_test_two.ks --logfile=mic1.log
     grep "Installing: A-.*" mic1.log
     grep "Installing: AA-.*" mic1.log
     sudo $losetup_path -a
@@ -33,7 +33,7 @@
         echo "Number of loop devices is not the same with previous number."
         exit 1
     fi
-    sudo mic -d -v cr fs obsolete_test_one.ks --logfile=mic2.log
+    sudo mic -d -v cr fs -A=x86_64 obsolete_test_one.ks --logfile=mic2.log
     (! grep "Installing: A-.*" mic2.log)
     grep "Installing: AAA-.*" mic2.log
     sudo $losetup_path -a
diff --git a/cases/create/mixed_cases/mic_cr_fs_priority.case b/cases/create/mixed_cases/mic_cr_fs_priority.case
index 16a012c..bd1cf41 100755
--- a/cases/create/mixed_cases/mic_cr_fs_priority.case
+++ b/cases/create/mixed_cases/mic_cr_fs_priority.case
@@ -16,7 +16,7 @@ done
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr fs handset_blackbay_priority.ks --logfile=./log/handset.log
+sudo mic -d -v cr fs -A=i686 handset_blackbay_priority.ks --logfile=./log/handset.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
 if [ "$loop_used_before" -ne "$loop_used_after" ];then
diff --git a/cases/create/mixed_cases/mic_cr_fs_without_conf_bootstrap_ia32.case b/cases/create/mixed_cases/mic_cr_fs_without_conf_bootstrap_ia32.case
index 57df4e3..77bd1c5 100755
--- a/cases/create/mixed_cases/mic_cr_fs_without_conf_bootstrap_ia32.case
+++ b/cases/create/mixed_cases/mic_cr_fs_without_conf_bootstrap_ia32.case
@@ -11,7 +11,7 @@ sudo mv /etc/mic/mic.conf /etc/mic/mic.conf.bak
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-! (sudo mic -d -v cr fs handset_blackbay.ks --logfile=handset.log --runtime=bootstrap) 2>&1 | tee mic.log
+! (sudo mic -d -v cr fs -A=i686 handset_blackbay.ks --logfile=handset.log --runtime=bootstrap) 2>&1 | tee mic.log
 grep -i "Failed to download/install bootstrap package" mic.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/mixed_cases/mic_cr_loop_bootstrap_check_chroot.case b/cases/create/mixed_cases/mic_cr_loop_bootstrap_check_chroot.case
index 2c71ff0..b90df6c 100755
--- a/cases/create/mixed_cases/mic_cr_loop_bootstrap_check_chroot.case
+++ b/cases/create/mixed_cases/mic_cr_loop_bootstrap_check_chroot.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --logfile=./log/handset.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --logfile=./log/handset.log
 test -f ./log/handset.log
 grep 'Finished' ./log/handset.log
 test -f ./mic-output/platform.img
diff --git a/cases/create/mixed_cases/mic_cr_loop_check_arch.case b/cases/create/mixed_cases/mic_cr_loop_check_arch.case
index 588799b..1f9d924 100755
--- a/cases/create/mixed_cases/mic_cr_loop_check_arch.case
+++ b/cases/create/mixed_cases/mic_cr_loop_check_arch.case
@@ -1,16 +1,15 @@
 <testcase>
   <summary>check if arch is right</summary>
   <fixtures>
-    <copy src="ks_files/handset_blackbay.ks" />
+    <copy src="ks_files/ivi.ks" />
   </fixtures>
   <steps><![CDATA[
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --logfile=mic.log
+sudo mic -d -v cr raw ivi.ks --logfile=mic.log
 grep 'Finished' mic.log
 grep 'Use detected arch i686' mic.log
-test -e mic-output/platform.img
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
 if [ "$loop_used_before" -ne "$loop_used_after" ];then
diff --git a/cases/create/mixed_cases/mic_cr_loop_check_user_and_group_info.case b/cases/create/mixed_cases/mic_cr_loop_check_user_and_group_info.case
index 5b003c1..bc69f4d 100755
--- a/cases/create/mixed_cases/mic_cr_loop_check_user_and_group_info.case
+++ b/cases/create/mixed_cases/mic_cr_loop_check_user_and_group_info.case
@@ -8,7 +8,7 @@ for output and cache directory, it's should be the current user</summary>
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks -o out1 -k cache --logfile=log.file
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -o out1 -k cache --logfile=log.file
 grep "Finished" log.file
 c_user=$(whoami)
 ls -l . | grep 'out1' | grep $c_user
diff --git a/cases/create/mixed_cases/mic_cr_loop_conf_etc_ia32.case b/cases/create/mixed_cases/mic_cr_loop_conf_etc_ia32.case
index ab30b33..59a9d04 100755
--- a/cases/create/mixed_cases/mic_cr_loop_conf_etc_ia32.case
+++ b/cases/create/mixed_cases/mic_cr_loop_conf_etc_ia32.case
@@ -9,7 +9,7 @@ losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 sudo cp mic.conf /etc
-sudo mic -d -v cr loop handset_blackbay.ks -c /etc/mic.conf --logfile=mic.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -c /etc/mic.conf --logfile=mic.log
 grep "Finished" mic.log
 sudo test -e ./mic-output/platform.img
 sudo $losetup_path -a
diff --git a/cases/create/mixed_cases/mic_cr_loop_exclude-from-image.case b/cases/create/mixed_cases/mic_cr_loop_exclude-from-image.case
index 821c119..b802d1a 100755
--- a/cases/create/mixed_cases/mic_cr_loop_exclude-from-image.case
+++ b/cases/create/mixed_cases/mic_cr_loop_exclude-from-image.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v --non-interactive cr loop  mobile_exclude.ks --logfile=log.file
+sudo mic -d -v --non-interactive cr loop -A=armv7l mobile_exclude.ks --logfile=log.file
 grep "Finished" log.file
 sudo test -e ./mic-output/u-boot-mmc.bin
 (! sudo test -e ./mic-output/boot.img)
diff --git a/cases/create/mixed_cases/mic_cr_loop_full_ks.case b/cases/create/mixed_cases/mic_cr_loop_full_ks.case
index 7d7f400..97ee338 100755
--- a/cases/create/mixed_cases/mic_cr_loop_full_ks.case
+++ b/cases/create/mixed_cases/mic_cr_loop_full_ks.case
@@ -22,7 +22,7 @@ assert manifest['loop']['partitions']['/opt/usr'] == 'ums'
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr auto whole_rd_210.ks --logfile=log.file
+sudo mic -d -v cr auto -A=armv7l whole_rd_210.ks --logfile=log.file
 grep "Finished" log.file
 sudo test -e ./mic-output/whole_rd_210-*.tar.gz
 img_file=$(ls mic-output | grep 'whole_rd_210-.*.tar.gz')
@@ -30,11 +30,13 @@ sudo tar zxvf mic-output/whole_rd_210-*.tar.gz  -C mic-output/
 sudo test -f mic-output/platform.img
 sudo test -f mic-output/data.img
 sudo test -f mic-output/ums.img
+sudo test -f mic-output/modules.img
 grep 'Copying attachment files' log.file
-sudo test -f mic-output/bootstub
-sudo test -f mic-output/cmdline
-sudo test -f mic-output/preos.manifest
-sudo test -f mic-output/vmlinuz-3.0.8-1.5-mfld-blackbay
+sudo test -f mic-output/bootloader.img
+sudo test -f mic-output/params.bin
+sudo test -f mic-output/zImage
+sudo test -f mic-output/s5p4418-artik530-raptor-rev00.dtb
+sudo test -f mic-output/s5p4418-artik530-raptor-rev03.dtb
 end_preinstall_line=$(grep 'Preinstall' -n log.file | sed -n '$p' | awk -F ':' '{print $1}')
 start_install_line=$(grep 'Install' -n log.file  | sed -n '2p' | awk -F ':' '{print $1}')
 test $start_install_line -gt $end_preinstall_line
diff --git a/cases/create/mixed_cases/mic_cr_loop_ks-under-root-directory_ia32.case b/cases/create/mixed_cases/mic_cr_loop_ks-under-root-directory_ia32.case
index da1f774..666d881 100755
--- a/cases/create/mixed_cases/mic_cr_loop_ks-under-root-directory_ia32.case
+++ b/cases/create/mixed_cases/mic_cr_loop_ks-under-root-directory_ia32.case
@@ -11,7 +11,7 @@ sudo cp handset_blackbay.ks /
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop /handset_blackbay.ks --logfile=mic1.log
+sudo mic -d -v cr loop -A=i686 /handset_blackbay.ks --logfile=mic1.log
 grep 'Finished' mic1.log
 test -f ./mic-output/platform.img
 sudo $losetup_path -a
diff --git a/cases/create/mixed_cases/mic_cr_loop_multi_partition.case b/cases/create/mixed_cases/mic_cr_loop_multi_partition.case
index e872901..4013641 100755
--- a/cases/create/mixed_cases/mic_cr_loop_multi_partition.case
+++ b/cases/create/mixed_cases/mic_cr_loop_multi_partition.case
@@ -1,7 +1,7 @@
 <testcase>
   <summary>This test case is used to test loop type with multiple partitions, in which there is a swap parition</summary>
   <fixtures>
-    <copy src="ks_files/RD-PQ.ks" />
+    <copy src="ks_files/armv7l.ks" />
   </fixtures>
   <steps><![CDATA[
 enforce_path=$(sudo which setenforce || true)
@@ -11,11 +11,10 @@ fi
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop RD-PQ.ks --logfile=log.file
+sudo mic -d -v cr loop -A=armv7l armv7l.ks --logfile=log.file
 grep "Finished" log.file
 sudo test -e ./mic-output/platform.img
-sudo test -e ./mic-output/ums.img
-sudo test -e ./mic-output/data.img
+sudo test -e ./mic-output/boot.img
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
 if [ "$loop_used_before" -ne "$loop_used_after" ];then
diff --git a/cases/create/mixed_cases/mic_cr_loop_no-cache.case b/cases/create/mixed_cases/mic_cr_loop_no-cache.case
index 9181b11..6e32167 100755
--- a/cases/create/mixed_cases/mic_cr_loop_no-cache.case
+++ b/cases/create/mixed_cases/mic_cr_loop_no-cache.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks \
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks \
   --logfile=./log/handset1.log \
   -k /var/tmp/my_cache
 test -f ./log/handset1.log
@@ -19,10 +19,10 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     echo "Number of loop devices is not the same with previous number."
     exit 1
 fi
-sudo mic -d -v cr loop handset_blackbay.ks \
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks \
   --logfile=./log/handset2.log \
   -k /var/tmp/my_cache
-grep "43 Total, 43 Cached, 0 Missed"   ./log/handset2.log
+grep "23 Total, 23 Cached, 0 Missed"   ./log/handset2.log
 test -f ./mic-output/platform.img
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
@@ -33,10 +33,10 @@ fi
 # Add "--nocache" to ks file
 sed -i '/repo/ s/$/ --nocache/' handset_blackbay.ks
 
-sudo mic -d -v cr loop handset_blackbay.ks --logfile=./log/handset3.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --logfile=./log/handset3.log
 test -f ./log/handset3.log
 # MIC download these 43 packages again,so it shows "43 Missed".
-grep "43 Total, 0 Cached, 43 Missed"   ./log/handset3.log
+grep "23 Total, 0 Cached, 23 Missed"   ./log/handset3.log
 grep "Finished" ./log/handset3.log
 test -f ./mic-output/platform.img
 sudo $losetup_path -a
diff --git a/cases/create/mixed_cases/mic_cr_loop_only_local_repo.case b/cases/create/mixed_cases/mic_cr_loop_only_local_repo.case
index 21b2c2c..b570a04 100755
--- a/cases/create/mixed_cases/mic_cr_loop_only_local_repo.case
+++ b/cases/create/mixed_cases/mic_cr_loop_only_local_repo.case
@@ -14,7 +14,7 @@ sudo rm -rf /home/build/tmp/mic/cache
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --logfile=mic1.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --logfile=mic1.log
 grep "Finished" mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/mixed_cases/mic_cr_loop_overridden.case b/cases/create/mixed_cases/mic_cr_loop_overridden.case
index 4a4ec76..d3abba4 100755
--- a/cases/create/mixed_cases/mic_cr_loop_overridden.case
+++ b/cases/create/mixed_cases/mic_cr_loop_overridden.case
@@ -11,7 +11,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --logfile=handset_auto.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --logfile=handset_auto.log
 grep 'Finished' handset_auto.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
@@ -21,7 +21,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
 fi
 time1=`stat mic-output/platform.img | grep -E "Access: [0-9]" | awk '{print $3}'`
 sleep 20
-sudo mic -d -v cr loop handset_blackbay.ks --logfile=handset_auto_1.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --logfile=handset_auto_1.log
 grep 'Finished' handset_auto_1.log
 time2=` stat mic-output/platform.img | grep -E "Access: [0-9]" | awk '{print $3}'`
 test "$time1" != "$time2"
diff --git a/cases/create/mixed_cases/mic_cr_loop_pack-to-tar-gz_multi_times.case b/cases/create/mixed_cases/mic_cr_loop_pack-to-tar-gz_multi_times.case
index 2ebb7dd..4e803a7 100755
--- a/cases/create/mixed_cases/mic_cr_loop_pack-to-tar-gz_multi_times.case
+++ b/cases/create/mixed_cases/mic_cr_loop_pack-to-tar-gz_multi_times.case
@@ -8,7 +8,7 @@ losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 for i in {1..10}; do
-    sudo mic -d -v cr loop handset_blackbay.ks --pack-to=@NAME@.tar.gz --logfile=mic.log
+    sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --pack-to=@NAME@.tar.gz --logfile=mic.log
     grep 'Finished' mic.log
     test -f ./mic-output/handset_blackbay*.tar.gz
     sudo gunzip  ./mic-output/handset_blackbay*.tar.gz
diff --git a/cases/create/mixed_cases/mic_cr_loop_release_ia32_bug.case b/cases/create/mixed_cases/mic_cr_loop_release_ia32_bug.case
index 27a8c18..7a5cee1 100755
--- a/cases/create/mixed_cases/mic_cr_loop_release_ia32_bug.case
+++ b/cases/create/mixed_cases/mic_cr_loop_release_ia32_bug.case
@@ -10,7 +10,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --release=tizen_20121223.1/ --logfile=mic.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --release=tizen_20121223.1/ --logfile=mic.log
 grep "Finished" mic.log
 test -e ./mic-output/tizen_20121223.1/images/handset_blackbay*/platform.img
 test -e ./mic-output/tizen_20121223.1/images/handset_blackbay*/MD5SUMS
diff --git a/cases/create/mixed_cases/mic_cr_loop_repo_local_repo.case b/cases/create/mixed_cases/mic_cr_loop_repo_local_repo.case
index 91fcef8..df20e43 100755
--- a/cases/create/mixed_cases/mic_cr_loop_repo_local_repo.case
+++ b/cases/create/mixed_cases/mic_cr_loop_repo_local_repo.case
@@ -14,7 +14,7 @@ sudo rm -rf /home/build/tmp/mic/cache
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --logfile=mic1.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --logfile=mic1.log
 grep "Finished" mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/mixed_cases/mic_cr_loop_tpk_local_repo.case b/cases/create/mixed_cases/mic_cr_loop_tpk_local_repo.case
index 24edcc8..a141375 100755
--- a/cases/create/mixed_cases/mic_cr_loop_tpk_local_repo.case
+++ b/cases/create/mixed_cases/mic_cr_loop_tpk_local_repo.case
@@ -5,11 +5,11 @@
   </fixtures>
   <steps><![CDATA[
 sudo mkdir -p /home/build/tmp/mic/tpk
-sudo wget -P /home/build/tmp/mic/tpk http://10.113.136.109/TPK/org.tizen.calendar-1.0.0-x86.tpk
+sudo wget -P /home/build/tmp/mic/tpk http://download.tizen.org/tools/repos/TPK/org.tizen.calendar-1.0.0-x86.tpk
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay_local_tpk_repo.ks --logfile=mic1.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay_local_tpk_repo.ks --logfile=mic1.log
 grep "Finished" mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/mixed_cases/mic_cr_loop_without_conf_bootstrap_ia32.case b/cases/create/mixed_cases/mic_cr_loop_without_conf_bootstrap_ia32.case
index 280f2fa..a9d1a8f 100755
--- a/cases/create/mixed_cases/mic_cr_loop_without_conf_bootstrap_ia32.case
+++ b/cases/create/mixed_cases/mic_cr_loop_without_conf_bootstrap_ia32.case
@@ -9,7 +9,7 @@ sudo mv /etc/mic/mic.conf /etc/mic/mic.conf.bak
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-! (sudo mic -d -v cr loop handset_blackbay.ks --logfile=handset.log --runtime=bootstrap) 2>&1 | tee mic.log
+! (sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --logfile=handset.log --runtime=bootstrap) 2>&1 | tee mic.log
 grep -i "Failed to download/install bootstrap package" mic.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/mixed_cases/mic_cr_loop_without_var_lock.case b/cases/create/mixed_cases/mic_cr_loop_without_var_lock.case
index 0d5cfb9..a18ebd5 100755
--- a/cases/create/mixed_cases/mic_cr_loop_without_var_lock.case
+++ b/cases/create/mixed_cases/mic_cr_loop_without_var_lock.case
@@ -14,7 +14,7 @@ fi
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --logfile=handset.log 2>&1 | tee all.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --logfile=handset.log 2>&1 | tee all.log
 grep 'Finished' all.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/mixed_cases/mic_cr_qcow_tpk_http_repo.case b/cases/create/mixed_cases/mic_cr_qcow_tpk_http_repo.case
index c36833c..c04a607 100755
--- a/cases/create/mixed_cases/mic_cr_qcow_tpk_http_repo.case
+++ b/cases/create/mixed_cases/mic_cr_qcow_tpk_http_repo.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop qcow_image_tpk_http_repo.ks --logfile=mic1.log
+sudo mic -d -v cr loop -A=i686 qcow_image_tpk_http_repo.ks --logfile=mic1.log
 grep "Finished" mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/mixed_cases/mic_cr_raw_active_partition.case b/cases/create/mixed_cases/mic_cr_raw_active_partition.case
index 79b0161..ef4daf5 100755
--- a/cases/create/mixed_cases/mic_cr_raw_active_partition.case
+++ b/cases/create/mixed_cases/mic_cr_raw_active_partition.case
@@ -14,7 +14,8 @@ loop_used_before=$(sudo $losetup_path -a | wc -l)
 sudo mic -d -v cr raw ivi_with_active_partition.ks --logfile=log.file
 test -e ./log.file
 grep "Finished" log.file
-raw_name=$(ls mic-output/ivi_with_active_partition-*-sdb.raw)
+cd mic-output/
+raw_name=$(ls ivi_with_active_partition-*-sdb.raw)
 test -f $raw_name
 kpartx_path=$(sudo which kpartx)
 distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()')
@@ -46,7 +47,9 @@ version=$(python -c 'import platform;print platform.linux_distribution()[1].rstr
 if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
     echo 'This is openSUSE42.3 platform.'
 elif [ !`echo $linux_distro |  grep -E "openSUSE.*42.*"` ]; then
-    sudo $kpartx_path -d $raw_name
+    loop_device=`sudo $losetup_path -a | grep $raw_name | awk -F : '{print $1}'`
+    sudo $kpartx_path -dv $loop_device
+    sudo $losetup_path -d $loop_device
 else
     loop_device=`$losetup_path -a | awk -F : '{print $1}'`
     sudo $kpartx_path -sd $loop_device
diff --git a/cases/create/mixed_cases/mic_cr_strict_mode_image.case b/cases/create/mixed_cases/mic_cr_strict_mode_image.case
index cd0e679..eefb573 100755
--- a/cases/create/mixed_cases/mic_cr_strict_mode_image.case
+++ b/cases/create/mixed_cases/mic_cr_strict_mode_image.case
@@ -14,10 +14,10 @@ losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 #zypp pkg manager
-sudo mic -d -v cr loop strict_mode.ks --logfile=./log/handset.log
+sudo mic -d -v cr loop -A=x86_64 strict_mode.ks --logfile=./log/handset.log
 grep 'Finished' ./log/handset.log
 #zypp pkg manager strict mode
-(! sudo mic -d -v cr loop strict_mode.ks --logfile=./log/handset.log --strict-mode)
+(! sudo mic -d -v cr loop -A=x86_64 strict_mode.ks --logfile=./log/handset.log --strict-mode)
 grep 'mic failes to install some packages' ./log/handset.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/neg_cases/mic_cr_fs_no_mountpoint.case b/cases/create/neg_cases/mic_cr_fs_no_mountpoint.case
index c5999ea..f105797 100755
--- a/cases/create/neg_cases/mic_cr_fs_no_mountpoint.case
+++ b/cases/create/neg_cases/mic_cr_fs_no_mountpoint.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr fs handset_blackbay_no_mountpoint.ks --logfile=./log/handset.log
+sudo mic -d -v cr fs -A=i686 handset_blackbay_no_mountpoint.ks --logfile=./log/handset.log
 test -f ./log/handset.log
 grep -i 'Finished' ./log/handset.log
 test -d ./mic-output/handset_blackbay_no_mountpoint*
diff --git a/cases/create/neg_cases/mic_cr_loop_compress-image_wrong-format.case b/cases/create/neg_cases/mic_cr_loop_compress-image_wrong-format.case
index 0f5a076..56a89c0 100755
--- a/cases/create/neg_cases/mic_cr_loop_compress-image_wrong-format.case
+++ b/cases/create/neg_cases/mic_cr_loop_compress-image_wrong-format.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --compress-image=az4 -o out2 --logfile=mic2.log 2>&1 | tee mic.log || true
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --compress-image=az4 -o out2 --logfile=mic2.log 2>&1 | tee mic.log || true
 grep -i "invalid choice.*az4.*" mic.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/neg_cases/negative_error-ks-with-chinese.case b/cases/create/neg_cases/negative_error-ks-with-chinese.case
index 8045b3a..545a4d0 100755
--- a/cases/create/neg_cases/negative_error-ks-with-chinese.case
+++ b/cases/create/neg_cases/negative_error-ks-with-chinese.case
@@ -9,7 +9,7 @@ losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 export LC_ALL=zh_CN.utf-8
-(! sudo mic -d -v cr auto error_ks_with_chinese.ks --logfile=mic1.log)
+(! sudo mic -d -v cr auto -A=i686 error_ks_with_chinese.ks --logfile=mic1.log)
 grep -i 'Unable to find package: 你好' mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/neg_cases/negative_error-package-ks.case b/cases/create/neg_cases/negative_error-package-ks.case
index 20c63f6..f3c9ee8 100755
--- a/cases/create/neg_cases/negative_error-package-ks.case
+++ b/cases/create/neg_cases/negative_error-package-ks.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-(! sudo mic -d -v cr auto error_package.ks --logfile=mic1.log)
+(! sudo mic -d -v cr auto -A=i686 error_package.ks --logfile=mic1.log)
 grep -i 'Unable to find package: svn' mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/neg_cases/negative_error-repo-ks.case b/cases/create/neg_cases/negative_error-repo-ks.case
index a44f93b..ca66db7 100755
--- a/cases/create/neg_cases/negative_error-repo-ks.case
+++ b/cases/create/neg_cases/negative_error-repo-ks.case
@@ -7,11 +7,12 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-(! sudo mic -d -v cr auto error_repo.ks --logfile=mic1.log )
+(! sudo mic -d -v cr auto -A=i686 error_repo.ks --logfile=mic1.log )
 grep 'URLGrabber error' mic1.log || \
   grep 'PYCURL ERROR' mic1.log || \
   grep 'HTTP Error' mic1.log  || \
-  grep '404 Not Found' mic1.log
+  grep '404 Not Found' mic1.log || \
+  grep 'Connection timed out' mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
 if [ "$loop_used_before" -ne "$loop_used_after" ];then
diff --git a/cases/create/neg_cases/negative_error_proxy_conf.case b/cases/create/neg_cases/negative_error_proxy_conf.case
index 66cdb62..3d4b488 100755
--- a/cases/create/neg_cases/negative_error_proxy_conf.case
+++ b/cases/create/neg_cases/negative_error_proxy_conf.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-(! sudo mic -d -v cr loop handset_blackbay.ks -c mic_error.conf 2>&1 | tee mic1.log)
+(! sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -c mic_error.conf 2>&1 | tee mic1.log)
 grep -i "[URLGrabber error|PYCURL ERROR|HTTP Error|couldn't connect]" mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/neg_cases/negative_error_proxy_conf_logfile.case b/cases/create/neg_cases/negative_error_proxy_conf_logfile.case
index 0544058..e9ae50e 100755
--- a/cases/create/neg_cases/negative_error_proxy_conf_logfile.case
+++ b/cases/create/neg_cases/negative_error_proxy_conf_logfile.case
@@ -11,7 +11,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-(! sudo mic -d -v cr loop handset_blackbay.ks -c mic_error.conf --logfile=error.log)
+(! sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -c mic_error.conf --logfile=error.log)
 grep -i "[URLGrabber error|PYCURL ERROR|HTTP Error|couldn't connect]" error.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/neg_cases/negative_no-package-ks.case b/cases/create/neg_cases/negative_no-package-ks.case
index 4f84817..4afe755 100755
--- a/cases/create/neg_cases/negative_no-package-ks.case
+++ b/cases/create/neg_cases/negative_no-package-ks.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-(! sudo mic -d -v cr loop error_no_package.ks --logfile=mic1.log)
+(! sudo mic -d -v cr loop -A=i686 error_no_package.ks --logfile=mic1.log)
 grep -i 'No packages or groups specified' mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/neg_cases/negative_non-existed-package.case b/cases/create/neg_cases/negative_non-existed-package.case
index 8deae7e..d7d56c0 100755
--- a/cases/create/neg_cases/negative_non-existed-package.case
+++ b/cases/create/neg_cases/negative_non-existed-package.case
@@ -8,7 +8,7 @@ losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 sed -i '/\%packages/a\hellokitty' handset_blackbay.ks
-(! sudo mic -d -v cr auto handset_blackbay.ks --logfile=mic1.log)
+(! sudo mic -d -v cr auto -A=i686 handset_blackbay.ks --logfile=mic1.log)
 grep -i "Unable to find package: hellokitty" mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/opt_cases/mic_cr_fs_include-src_ia32.case b/cases/create/opt_cases/mic_cr_fs_include-src_ia32.case
index be6c1a1..f718608 100755
--- a/cases/create/opt_cases/mic_cr_fs_include-src_ia32.case
+++ b/cases/create/opt_cases/mic_cr_fs_include-src_ia32.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr fs handset_blackbay.ks --include-src  --logfile=mic1.log
+sudo mic -d -v cr fs -A=i686 handset_blackbay.ks --include-src  --logfile=mic1.log
 grep 'Finished' mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/opt_cases/mic_cr_fs_record-pkgs-name-content-license-vcs_ia32.case b/cases/create/opt_cases/mic_cr_fs_record-pkgs-name-content-license-vcs_ia32.case
index b4d4a4a..8a23a53 100755
--- a/cases/create/opt_cases/mic_cr_fs_record-pkgs-name-content-license-vcs_ia32.case
+++ b/cases/create/opt_cases/mic_cr_fs_record-pkgs-name-content-license-vcs_ia32.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr fs handset_blackbay.ks --record-pkgs=name,content,license,vcs  --logfile=mic.log
+sudo mic -d -v cr fs -A=i686 handset_blackbay.ks --record-pkgs=name,content,license,vcs  --logfile=mic.log
 grep 'Finished' mic.log
 test -d ./mic-output/handset_blackbay*[0-9]
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_fs_runtime-bootstrap_ia32.case b/cases/create/opt_cases/mic_cr_fs_runtime-bootstrap_ia32.case
index bf174c7..a3bc6fd 100755
--- a/cases/create/opt_cases/mic_cr_fs_runtime-bootstrap_ia32.case
+++ b/cases/create/opt_cases/mic_cr_fs_runtime-bootstrap_ia32.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr fs handset_blackbay.ks --runtime=bootstrap  --logfile=mic.log
+sudo mic -d -v cr fs -A=i686 handset_blackbay.ks --runtime=bootstrap  --logfile=mic.log
 grep 'Start mic in bootstrap' mic.log
 grep 'Finished' mic.log
 image_name=`ls ./mic-output | grep 'handset_blackbay*'`
diff --git a/cases/create/opt_cases/mic_cr_loop_arc-invalid_ia32.case b/cases/create/opt_cases/mic_cr_loop_arc-invalid_ia32.case
index ff05299..d9a5684 100755
--- a/cases/create/opt_cases/mic_cr_loop_arc-invalid_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_arc-invalid_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-! (sudo mic -d -v cr loop handset_blackbay.ks -A i286 --logfile=mic1.log)
+! (sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -A i286 --logfile=mic1.log)
 grep "Invalid architecture" mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/opt_cases/mic_cr_loop_arc_ia32.case b/cases/create/opt_cases/mic_cr_loop_arc_ia32.case
index b197ebd..bcac1ed 100755
--- a/cases/create/opt_cases/mic_cr_loop_arc_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_arc_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks -A i686 --logfile=log.file
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks  --logfile=log.file
 grep "Finished" log.file
 test -e ./mic-output/platform.img
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_arch-vague_ia32.case b/cases/create/opt_cases/mic_cr_loop_arch-vague_ia32.case
index 12a4488..a63fc38 100755
--- a/cases/create/opt_cases/mic_cr_loop_arch-vague_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_arch-vague_ia32.case
@@ -1,5 +1,5 @@
 <testcase>
-  <summary>create loop image with @ARCH@ is ks file, and run command with -A armv7l</summary>
+  <summary>create loop image with @ARCH@ is ks file, and run command with -A x86_64</summary>
   <fixtures>
     <copy src="ks_files/armv7l_with_arch.ks" />
   </fixtures>
@@ -11,9 +11,9 @@ enforce_path=$(sudo which setenforce || true)
 if [ ! -z $enforce_path ];then
     sudo $enforce_path 0 || true
 fi
-sudo mic -d -v cr loop armv7l_with_arch.ks -A armv7l -o out1 --logfile=mic1.log
+sudo mic -d -v cr loop armv7l_with_arch.ks -A x86_64 -o out1 --logfile=mic1.log
 grep 'Finished' mic1.log
-grep 'armv7l' mic1.log
+grep 'x86_64' mic1.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
 if [ "$loop_used_before" -ne "$loop_used_after" ];then
diff --git a/cases/create/opt_cases/mic_cr_loop_cache-current-dir_ia32.case b/cases/create/opt_cases/mic_cr_loop_cache-current-dir_ia32.case
index 38cdf76..204d042 100755
--- a/cases/create/opt_cases/mic_cr_loop_cache-current-dir_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_cache-current-dir_ia32.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --cachedir=./cache/mic_cache --logfile=file.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --cachedir=./cache/mic_cache --logfile=file.log
 grep 'Finished' file.log
 test -f ./mic-output/platform.img
 test -d ./cache/mic_cache
diff --git a/cases/create/opt_cases/mic_cr_loop_cache-root-dir_ia32.case b/cases/create/opt_cases/mic_cr_loop_cache-root-dir_ia32.case
index 2aba2b2..0f0bb53 100755
--- a/cases/create/opt_cases/mic_cr_loop_cache-root-dir_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_cache-root-dir_ia32.case
@@ -15,9 +15,9 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks -k /root/cache/mic_cache --logfile=file.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -k /root/cache/mic_cache --logfile=file.log
 grep 'Finished' file.log
-grep "43 Total, 0 Cached, 43 Missed" file.log
+grep "23 Total, 0 Cached, 23 Missed" file.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
 if [ "$loop_used_before" -ne "$loop_used_after" ];then
@@ -28,7 +28,7 @@ sudo test -d /root/cache/mic_cache
 test -f ./mic-output/platform.img
 sudo rm -rf file.log
 sudo rm -rf mic-output
-sudo mic -d -v cr loop handset_blackbay.ks -k /root/cache/mic_cache --logfile=file.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -k /root/cache/mic_cache --logfile=file.log
 grep 'Finished' file.log
 test -f ./mic-output/platform.img
 sudo $losetup_path -a
@@ -37,7 +37,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     echo "Number of loop devices is not the same with previous number."
     exit 1
 fi
-grep "43 Total, 43 Cached, 0 Missed" file.log
+grep "23 Total, 23 Cached, 0 Missed" file.log
 ]]></steps>
   <teardown><![CDATA[
 echo "cleaning..."
diff --git a/cases/create/opt_cases/mic_cr_loop_compress-image-bz2_ia32.case b/cases/create/opt_cases/mic_cr_loop_compress-image-bz2_ia32.case
index 036ca49..c9cc390 100755
--- a/cases/create/opt_cases/mic_cr_loop_compress-image-bz2_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_compress-image-bz2_ia32.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks -o out1 --logfile=mic1.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -o out1 --logfile=mic1.log
 grep 'Finished' mic1.log
 test -f ./out1/platform.img
 sudo $losetup_path -a
@@ -17,7 +17,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     echo "Number of loop devices is not the same with previous number."
     exit 1
 fi
-sudo mic -d -v cr loop handset_blackbay.ks --compress-image=bz2 -o out2 --logfile=mic2.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --compress-image=bz2 -o out2 --logfile=mic2.log
 grep 'Finished' mic2.log
 test -f ./out2/platform.img.bz2
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_compress-image-gz_ia32.case b/cases/create/opt_cases/mic_cr_loop_compress-image-gz_ia32.case
index de6197c..e23f0ac 100755
--- a/cases/create/opt_cases/mic_cr_loop_compress-image-gz_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_compress-image-gz_ia32.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks -o out1 --logfile=mic1.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -o out1 --logfile=mic1.log
 grep 'Finished' mic1.log
 test -f ./out1/platform.img
 sudo $losetup_path -a
@@ -17,7 +17,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     echo "Number of loop devices is not the same with previous number."
     exit 1
 fi
-sudo mic -d -v cr loop handset_blackbay.ks --compress-image=gz -o out2 --logfile=mic2.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --compress-image=gz -o out2 --logfile=mic2.log
 grep 'Finished' mic2.log
 test -f ./out2/platform.img.gz
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_compress-image-invalid_ia32.case b/cases/create/opt_cases/mic_cr_loop_compress-image-invalid_ia32.case
index a800ac5..3a97d73 100755
--- a/cases/create/opt_cases/mic_cr_loop_compress-image-invalid_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_compress-image-invalid_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-! (sudo mic -d -v cr loop handset_blackbay.ks --compress-image=zip  2>&1 | tee mic2.log)
+! (sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --compress-image=zip  2>&1 | tee mic2.log)
 grep -E "compress-image: invalid choice: 'zip'" mic2.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/opt_cases/mic_cr_loop_conf_ia32.case b/cases/create/opt_cases/mic_cr_loop_conf_ia32.case
index 9d1fe92..55d4a1a 100755
--- a/cases/create/opt_cases/mic_cr_loop_conf_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_conf_ia32.case
@@ -10,7 +10,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks -c mic.conf --logfile=log.file
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -c mic.conf --logfile=log.file
 grep "Finished" log.file
 test -f ./my_mic-output/platform.img
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_copy-kernel_ia32.case b/cases/create/opt_cases/mic_cr_loop_copy-kernel_ia32.case
index 5b585da..84d2ccb 100755
--- a/cases/create/opt_cases/mic_cr_loop_copy-kernel_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_copy-kernel_ia32.case
@@ -1,13 +1,13 @@
 <testcase>
   <summary>mic create loop image with ia32 arch and --copy-kernel</summary>
   <fixtures>
-    <copy src="ks_files/handset_blackbay.ks" />
+    <copy src="ks_files/ivi.ks" />
   </fixtures>
   <steps><![CDATA[
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --copy-kernel --logfile=mic.log
+sudo mic -d -v cr loop -A=i686 ivi.ks --copy-kernel --logfile=mic.log
 grep 'Finished' mic.log
 test -f ./mic-output/platform.img
 sudo $losetup_path -a
@@ -16,11 +16,11 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     echo "Number of loop devices is not the same with previous number."
     exit 1
 fi
-ls -l ./mic-output | grep -E 'handset_blackbay.*vm.*'
+ls -l ./mic-output | grep -E 'ivi.*vm.*'
 ]]></steps>
   <teardown><![CDATA[
 echo "cleaning..."
-sudo rm -rf ./mic-output
+#sudo rm -rf ./mic-output
 sudo rm -rf mic.log
 echo "finish cleaning..."
 ]]></teardown>
diff --git a/cases/create/opt_cases/mic_cr_loop_debug_ia32.case b/cases/create/opt_cases/mic_cr_loop_debug_ia32.case
index 4e2153e..7d3efd3 100755
--- a/cases/create/opt_cases/mic_cr_loop_debug_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_debug_ia32.case
@@ -11,7 +11,7 @@ enforce_path=$(sudo which setenforce || true)
 if [ ! -z $enforce_path ];then
     sudo $enforce_path 0 || true
 fi
-sudo mic -d -v cr loop armv7l.ks -o out1  2>&1 | tee mic1.log
+sudo mic --non-interactive -d -v cr loop -A=armv7l armv7l.ks -o out1  2>&1 | tee mic1.log
 grep -i 'Finished' mic1.log
 grep -i 'Debug' mic1.log
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_interactive_ia32.case b/cases/create/opt_cases/mic_cr_loop_interactive_ia32.case
index d499637..fe23951 100755
--- a/cases/create/opt_cases/mic_cr_loop_interactive_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_interactive_ia32.case
@@ -8,7 +8,7 @@ losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 sed -i '/shadow-utils/d' handset_blackbay.ks
-sudo mic --non-interactive cr loop handset_blackbay.ks 
+sudo mic --non-interactive cr loop -A=i686 handset_blackbay.ks
 test -f ./mic-output/platform.img
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
@@ -16,7 +16,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     echo "Number of loop devices is not the same with previous number."
     exit 1
 fi
-bash -c "sudo mic -i cr loop handset_blackbay.ks 2>&1 >> tmp.log" << EOF
+bash -c "sudo mic -i cr loop -A=i686 handset_blackbay.ks 2>&1 >> tmp.log" << EOF
 n
 EOF
 grep ".* \[y/n](y): INFO" tmp.log
diff --git a/cases/create/opt_cases/mic_cr_loop_local-pkg-path_ia32.case b/cases/create/opt_cases/mic_cr_loop_local-pkg-path_ia32.case
index 4d38dda..9c49cdd 100755
--- a/cases/create/opt_cases/mic_cr_loop_local-pkg-path_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_local-pkg-path_ia32.case
@@ -9,7 +9,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr fs handset_blackbay.ks --local-pkgs-path=./rpm --logfile=./log/handset.log
+sudo mic -d -v cr fs -A=i686 handset_blackbay.ks --local-pkgs-path=./rpm --logfile=./log/handset.log
 test -f ./log/handset.log
 grep 'Finished' ./log/handset.log
 test -e ./mic-output/handset_blackbay*[0-9]
diff --git a/cases/create/opt_cases/mic_cr_loop_logfile-current-dir_ia32.case b/cases/create/opt_cases/mic_cr_loop_logfile-current-dir_ia32.case
index 1ef3f29..56ee1bb 100755
--- a/cases/create/opt_cases/mic_cr_loop_logfile-current-dir_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_logfile-current-dir_ia32.case
@@ -14,7 +14,7 @@ sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 hostname=$(hostname)
 mkdir ./log_dir
-! (sudo mic -d -v cr loop handset_blackbay.ks --logfile=./log_dir 2>&1 | tee  mic.log )
+! (sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --logfile=./log_dir 2>&1 | tee  mic.log )
 grep -i "./log_dir should be file"  mic.log
 grep "$hostname" mic.log
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_logfile-current-file_ia32.case b/cases/create/opt_cases/mic_cr_loop_logfile-current-file_ia32.case
index 78500e8..c60e739 100755
--- a/cases/create/opt_cases/mic_cr_loop_logfile-current-file_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_logfile-current-file_ia32.case
@@ -10,7 +10,7 @@ losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 hostname=$(hostname)
-sudo mic -d -v cr loop handset_blackbay.ks --logfile=./log/handset.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --logfile=./log/handset.log
 test -f ./log/handset.log
 grep 'Finished' ./log/handset.log
 grep "$hostname" ./log/handset.log
diff --git a/cases/create/opt_cases/mic_cr_loop_logfile-root-file_ia32.case b/cases/create/opt_cases/mic_cr_loop_logfile-root-file_ia32.case
index 03470f8..99bd55c 100755
--- a/cases/create/opt_cases/mic_cr_loop_logfile-root-file_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_logfile-root-file_ia32.case
@@ -8,7 +8,7 @@ losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 hostname=$(hostname)
-sudo mic -d -v cr loop handset_blackbay.ks --logfile=/root/log_file  >> mic.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --logfile=/root/log_file  >> mic.log
 grep "Finished" mic.log
 sudo test -e /root/log_file
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_outdir-current-dir_ia32.case b/cases/create/opt_cases/mic_cr_loop_outdir-current-dir_ia32.case
index 3bd560a..fe6df16 100755
--- a/cases/create/opt_cases/mic_cr_loop_outdir-current-dir_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_outdir-current-dir_ia32.case
@@ -8,7 +8,7 @@ it can be set to an existed directory and also can be set to an unexisted direct
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --outdir=my_mic_out  --logfile=log.file
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --outdir=my_mic_out  --logfile=log.file
 grep "Finished" log.file
 if [ -e my_mic_out/platform.img ]; then echo " Image found. " ; else echo "Image not found." && exit 1 ; fi
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_outdir-root-dir_ia32.case b/cases/create/opt_cases/mic_cr_loop_outdir-root-dir_ia32.case
index 1ca8120..b7972d5 100755
--- a/cases/create/opt_cases/mic_cr_loop_outdir-root-dir_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_outdir-root-dir_ia32.case
@@ -8,7 +8,7 @@ a subdirectory under /root is given to it, related images should can be found un
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks -o /root/my_mic_out  --logfile=log.file
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -o /root/my_mic_out  --logfile=log.file
 grep "Finished" log.file
 sudo test -f /root/my_mic_out/platform.img
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_pack-to-Invalid_ia32.case b/cases/create/opt_cases/mic_cr_loop_pack-to-Invalid_ia32.case
index a3b7ade..96efb20 100755
--- a/cases/create/opt_cases/mic_cr_loop_pack-to-Invalid_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_pack-to-Invalid_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-(! sudo mic -d -v cr loop handset_blackbay.ks --pack-to=@NAME@.bz2  --logfile=mic.log)
+(! sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --pack-to=@NAME@.bz2  --logfile=mic.log)
 grep 'Not supported archive file format' mic.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/opt_cases/mic_cr_loop_pack-to-tar-bz2_ia32.case b/cases/create/opt_cases/mic_cr_loop_pack-to-tar-bz2_ia32.case
index 1b75ddf..4c42646 100755
--- a/cases/create/opt_cases/mic_cr_loop_pack-to-tar-bz2_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_pack-to-tar-bz2_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --pack-to=@NAME@.tar.bz2 --logfile=mic.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --pack-to=@NAME@.tar.bz2 --logfile=mic.log
 grep 'Finished' mic.log
 test -f ./mic-output/handset_blackbay*.tar.bz2
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_pack-to-tar-bz_ia32.case b/cases/create/opt_cases/mic_cr_loop_pack-to-tar-bz_ia32.case
index 9177092..ca2d131 100755
--- a/cases/create/opt_cases/mic_cr_loop_pack-to-tar-bz_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_pack-to-tar-bz_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr  loop handset_blackbay.ks --pack-to=@NAME@.tar.bz --logfile=mic.log
+sudo mic -d -v cr  loop -A=i686 handset_blackbay.ks --pack-to=@NAME@.tar.bz --logfile=mic.log
 grep 'Finished' mic.log
 test -f ./mic-output/handset_blackbay*.tar.bz
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_pack-to-tar-gz_ia32.case b/cases/create/opt_cases/mic_cr_loop_pack-to-tar-gz_ia32.case
index 3663f97..cea63c3 100755
--- a/cases/create/opt_cases/mic_cr_loop_pack-to-tar-gz_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_pack-to-tar-gz_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --pack-to=@NAME@.tar.gz  --logfile=mic.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --pack-to=@NAME@.tar.gz  --logfile=mic.log
 grep 'Finished' mic.log
 test -f ./mic-output/handset_blackbay*.tar.gz
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_pack-to-tar_ia32.case b/cases/create/opt_cases/mic_cr_loop_pack-to-tar_ia32.case
index 2b2f6ce..cb325eb 100755
--- a/cases/create/opt_cases/mic_cr_loop_pack-to-tar_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_pack-to-tar_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --pack-to=@NAME@.tar  --logfile=mic.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --pack-to=@NAME@.tar  --logfile=mic.log
 grep 'Finished' mic.log
 test -f ./mic-output/handset_blackbay*.tar
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_pack-to-taz.case b/cases/create/opt_cases/mic_cr_loop_pack-to-taz.case
index 65ab9e6..489531d 100755
--- a/cases/create/opt_cases/mic_cr_loop_pack-to-taz.case
+++ b/cases/create/opt_cases/mic_cr_loop_pack-to-taz.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr  loop handset_blackbay.ks \
+sudo mic -d -v cr  loop -A=i686 handset_blackbay.ks \
   --pack-to=@NAME@.taz \
   --logfile=mic.log
 grep 'Finished' mic.log
diff --git a/cases/create/opt_cases/mic_cr_loop_pack-to-tbz2_ia32.case b/cases/create/opt_cases/mic_cr_loop_pack-to-tbz2_ia32.case
index 05c2cd7..1117ee9 100755
--- a/cases/create/opt_cases/mic_cr_loop_pack-to-tbz2_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_pack-to-tbz2_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --pack-to=@NAME@.tbz2 --logfile=mic.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --pack-to=@NAME@.tbz2 --logfile=mic.log
 grep 'Finished' mic.log
 test -f ./mic-output/handset_blackbay*.tbz2
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_pack-to-tbz_ia32.case b/cases/create/opt_cases/mic_cr_loop_pack-to-tbz_ia32.case
index d5271b3..63d3da2 100755
--- a/cases/create/opt_cases/mic_cr_loop_pack-to-tbz_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_pack-to-tbz_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --pack-to=@NAME@.tbz --logfile=mic.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --pack-to=@NAME@.tbz --logfile=mic.log
 grep 'Finished' mic.log
 test -f ./mic-output/handset_blackbay*.tbz
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_pack-to-tgz.case b/cases/create/opt_cases/mic_cr_loop_pack-to-tgz.case
index c4aa513..2bf1b42 100755
--- a/cases/create/opt_cases/mic_cr_loop_pack-to-tgz.case
+++ b/cases/create/opt_cases/mic_cr_loop_pack-to-tgz.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks \
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks \
   --pack-to=@NAME@.tgz \
   --logfile=mic.log
 grep 'Finished' mic.log
diff --git a/cases/create/opt_cases/mic_cr_loop_pack-to-zip_ia32.case b/cases/create/opt_cases/mic_cr_loop_pack-to-zip_ia32.case
index 9e3125f..793a90b 100755
--- a/cases/create/opt_cases/mic_cr_loop_pack-to-zip_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_pack-to-zip_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks \
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks \
   --pack-to=@NAME@.zip \
   --logfile=mic.log
 grep 'Resizing filesystem' mic.log
diff --git a/cases/create/opt_cases/mic_cr_loop_pkgmgr-Invalid_ia32.case b/cases/create/opt_cases/mic_cr_loop_pkgmgr-Invalid_ia32.case
index 3a884d7..ef77558 100755
--- a/cases/create/opt_cases/mic_cr_loop_pkgmgr-Invalid_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_pkgmgr-Invalid_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-! (sudo mic -d -v cr loop handset_blackbay.ks --pkgmgr=None 2>&1 | tee mic.log)
+! (sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --pkgmgr=None 2>&1 | tee mic.log)
 grep -i "Can't find backend: None" mic.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/opt_cases/mic_cr_loop_pkgmgr-yum_ia32.case b/cases/create/opt_cases/mic_cr_loop_pkgmgr-yum_ia32.case
index a893542..72ab4d2 100755
--- a/cases/create/opt_cases/mic_cr_loop_pkgmgr-yum_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_pkgmgr-yum_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-! (sudo mic -d -v cr loop handset_blackbay.ks --pkgmgr=yum 2>&1 | tee mic.log)
+! (sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --pkgmgr=yum 2>&1 | tee mic.log)
 grep -i "Can't find backend: yum" mic.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/opt_cases/mic_cr_loop_pkgmgr-zypp_ia32.case b/cases/create/opt_cases/mic_cr_loop_pkgmgr-zypp_ia32.case
index 74653b9..5848f1b 100755
--- a/cases/create/opt_cases/mic_cr_loop_pkgmgr-zypp_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_pkgmgr-zypp_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --pkgmgr=zypp  --logfile=mic.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --pkgmgr=zypp  --logfile=mic.log
 grep 'Finished' mic.log
 test -f ./mic-output/platform.img
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_record-pkgs-Invalid_ia32.case b/cases/create/opt_cases/mic_cr_loop_record-pkgs-Invalid_ia32.case
index 067eed0..c74e621 100755
--- a/cases/create/opt_cases/mic_cr_loop_record-pkgs-Invalid_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_record-pkgs-Invalid_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-! (sudo mic -d -v cr loop handset_blackbay.ks --record-pkgs=propery  2>&1 | tee mic.log)
+! (sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --record-pkgs=propery  2>&1 | tee mic.log)
 grep -i 'Invalid pkg recording: propery' mic.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/opt_cases/mic_cr_loop_record-pkgs-name-content-license-vcs_ia32.case b/cases/create/opt_cases/mic_cr_loop_record-pkgs-name-content-license-vcs_ia32.case
index 46981f5..289271d 100755
--- a/cases/create/opt_cases/mic_cr_loop_record-pkgs-name-content-license-vcs_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_record-pkgs-name-content-license-vcs_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks \
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks \
   --record-pkgs=name,content,license,vcs \
   --logfile=mic.log
 grep 'Finished' mic.log
diff --git a/cases/create/opt_cases/mic_cr_loop_release_check_log_completeness.case b/cases/create/opt_cases/mic_cr_loop_release_check_log_completeness.case
index c32d605..74acde7 100755
--- a/cases/create/opt_cases/mic_cr_loop_release_check_log_completeness.case
+++ b/cases/create/opt_cases/mic_cr_loop_release_check_log_completeness.case
@@ -9,7 +9,7 @@ then test whether image will generate correspondently.</summary>
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic --non-interactive cr loop handset_blackbay.ks --release=tizen-2.2_20130719.3
+sudo mic --non-interactive cr loop -A=i686 handset_blackbay.ks --release=tizen-2.2_20130719.3
 grep "Finished" ./mic-output/tizen-2.2_20130719.3/images/handset_blackbay*/tizen-2.2_20130719.3_handset_blackbay.log
 sudo test -f ./mic-output/tizen-2.2_20130719.3/images/handset_blackbay*/platform.img
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_release_ia32.case b/cases/create/opt_cases/mic_cr_loop_release_ia32.case
index a759452..a4b0aae 100755
--- a/cases/create/opt_cases/mic_cr_loop_release_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_release_ia32.case
@@ -9,7 +9,7 @@ then test whether image will generate correspondently.</summary>
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic --non-interactive cr loop handset_blackbay.ks --release=tizen-2.2_20130719.3
+sudo mic --non-interactive cr loop -A=i686 handset_blackbay.ks --release=tizen-2.2_20130719.3
 grep "Finished" ./mic-output/tizen-2.2_20130719.3/images/handset_blackbay*/tizen-2.2_20130719.3_handset_blackbay.log
 sudo test -f ./mic-output/tizen-2.2_20130719.3/images/handset_blackbay*/platform.img
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_release_latest_ia32.case b/cases/create/opt_cases/mic_cr_loop_release_latest_ia32.case
index 20d9b3f..6a30eca 100755
--- a/cases/create/opt_cases/mic_cr_loop_release_latest_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_release_latest_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic --non-interactive cr loop handset_blackbay.ks  --release=latest
+sudo mic --non-interactive cr loop -A=i686 handset_blackbay.ks  --release=latest
 grep "Finished" ./mic-output/latest/images/handset_blackbay*/latest_handset_blackbay.log
 sudo test -f ./mic-output/latest/images/handset_blackbay*/platform.img
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_release_pack-to.case b/cases/create/opt_cases/mic_cr_loop_release_pack-to.case
index 1eeef66..3eb7636 100755
--- a/cases/create/opt_cases/mic_cr_loop_release_pack-to.case
+++ b/cases/create/opt_cases/mic_cr_loop_release_pack-to.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --release SNAPSHOT --pack-to=IMAGENAME.tar.gz
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --release SNAPSHOT --pack-to=IMAGENAME.tar.gz
 grep 'Finished' ./mic-output/SNAPSHOT/images/handset_blackbay/IMAGENAME.log
 test -f ./mic-output/SNAPSHOT/images/handset_blackbay/IMAGENAME.tar.gz
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_repo_ia32.case b/cases/create/opt_cases/mic_cr_loop_repo_ia32.case
index 24e54ac..c6b9f93 100755
--- a/cases/create/opt_cases/mic_cr_loop_repo_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_repo_ia32.case
@@ -10,7 +10,7 @@ losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 # give one repo in command line, another in ks
-sudo mic -d -v cr loop handset_blackbay_test_repo.ks --repo "name=Tizen-main;baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/" --logfile=handset1.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay_test_repo.ks --repo "name=Tizen-main;baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/" --logfile=handset1.log
 grep 'Finished' handset1.log
 test -e mic-output/platform.img
 sudo $losetup_path -a
@@ -20,7 +20,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     exit 1
 fi
 # give two repos in command line and ignore ks repo
-sudo mic -d -v cr loop handset_blackbay_test_repo.ks --repo "name=Tizen-main;baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/" --repo "name=Tizen-base;baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/" --logfile=handset2.log --ignore-ksrepo
+sudo mic -d -v cr loop -A=i686 handset_blackbay_test_repo.ks --repo "name=Tizen-main;baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/" --repo "name=Tizen-base;baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/" --logfile=handset2.log --ignore-ksrepo
 grep 'Finished' handset2.log
 # give one repo in command line and one in ks, ignore ks repo
 sudo $losetup_path -a
@@ -29,7 +29,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     echo "Number of loop devices is not the same with previous number."
     exit 1
 fi
-! (sudo mic -d -v cr loop handset_blackbay_test_repo.ks --repo "name=Tizen-main;baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/" --logfile=handset3.log --ignore-ksrepo)
+! (sudo mic -d -v cr loop -A=i686 handset_blackbay_test_repo.ks --repo "name=Tizen-main;baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/" --logfile=handset3.log --ignore-ksrepo)
 grep -i "Unable to find package" handset3.log
 ]]></steps>
   <teardown><![CDATA[
diff --git a/cases/create/opt_cases/mic_cr_loop_runtime-Invalid_ia32.case b/cases/create/opt_cases/mic_cr_loop_runtime-Invalid_ia32.case
index 6df9e50..f5da322 100755
--- a/cases/create/opt_cases/mic_cr_loop_runtime-Invalid_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_runtime-Invalid_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-! (sudo mic -d -v cr loop handset_blackbay.ks --runtime=invalid  2>&1 | tee mic.log)
+! (sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --runtime=invalid  2>&1 | tee mic.log)
 grep -i "Invalid runtime mode: invalid" mic.log
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)
diff --git a/cases/create/opt_cases/mic_cr_loop_runtime-bootstrap_ia32.case b/cases/create/opt_cases/mic_cr_loop_runtime-bootstrap_ia32.case
index 068050c..72df5ac 100755
--- a/cases/create/opt_cases/mic_cr_loop_runtime-bootstrap_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_runtime-bootstrap_ia32.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks \
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks \
   --runtime=bootstrap \
   --logfile=mic.log
 grep 'Start mic in bootstrap' mic.log
diff --git a/cases/create/opt_cases/mic_cr_loop_shrink_ia32.case b/cases/create/opt_cases/mic_cr_loop_shrink_ia32.case
index e5bc654..b9b8f05 100755
--- a/cases/create/opt_cases/mic_cr_loop_shrink_ia32.case
+++ b/cases/create/opt_cases/mic_cr_loop_shrink_ia32.case
@@ -8,7 +8,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks -o out1 --logfile=mic1.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -o out1 --logfile=mic1.log
 grep 'Finished' mic1.log
 test -f ./out1/platform.img
 sudo $losetup_path -a
@@ -17,7 +17,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     echo "Number of loop devices is not the same with previous number."
     exit 1
 fi
-sudo mic -d -v cr loop handset_blackbay.ks -o out2 --shrink --logfile=mic2.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks -o out2 --shrink --logfile=mic2.log
 grep 'Finished' mic2.log
 test -f ./out2/platform.img
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_loop_tmpfs.case b/cases/create/opt_cases/mic_cr_loop_tmpfs.case
index c6cd1d4..d12ca87 100755
--- a/cases/create/opt_cases/mic_cr_loop_tmpfs.case
+++ b/cases/create/opt_cases/mic_cr_loop_tmpfs.case
@@ -7,7 +7,7 @@
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-sudo mic -d -v cr loop handset_blackbay.ks --tmpfs --logfile=./log/handset.log
+sudo mic -d -v cr loop -A=i686 handset_blackbay.ks --tmpfs --logfile=./log/handset.log
 test -f ./log/handset.log
 grep 'Finished' ./log/handset.log
 sudo $losetup_path -a
diff --git a/cases/create/opt_cases/mic_cr_qcow_logfile-current-file_ia32.case b/cases/create/opt_cases/mic_cr_qcow_logfile-current-file_ia32.case
index 737ddd3..693c77e 100755
--- a/cases/create/opt_cases/mic_cr_qcow_logfile-current-file_ia32.case
+++ b/cases/create/opt_cases/mic_cr_qcow_logfile-current-file_ia32.case
@@ -8,7 +8,7 @@ losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
 hostname=$(hostname)
-sudo mic -d -v cr qcow qcow_image.ks --logfile=./log/qcow.log -k /home/build/mic-tmp-cache
+sudo mic -d -v cr qcow -A=i686 qcow_image.ks --logfile=./log/qcow.log -k /home/build/mic-tmp-cache
 # use '-k /home/build/mic-tmp-cache', because directory '/home/build/' has larger space, if
 # use default cache dir, mic will throw error 'Failed to umount /var/***/install_root' on
 # Ubuntu_12.04_64bit qemu-kvm
diff --git a/fixtures/ks_files/RD-PQ.ks b/fixtures/ks_files/RD-PQ.ks
index 87d2ec8..1650cd5 100755
--- a/fixtures/ks_files/RD-PQ.ks
+++ b/fixtures/ks_files/RD-PQ.ks
@@ -23,22 +23,18 @@ user --name root  --groups audio,video --password ''
 
 installerfw_plugins "fstab"
 
-repo --name=mobile --baseurl=http://10.113.136.109/repo/download.tizen.org/snapshots/tizen/rd-pq/tizen_20140602.4/repos/mobile/armv7l/packages/ --save  --ssl_verify=no
+repo --name=mobile --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/ --save  --ssl_verify=no
 
 %packages
 
-@Base System
 @Console Tools
 @Mobile Enlightenment
 @Mobile Applications
-@Mobile Framework
-@Mobile Osp
 @RD PQ Adaptation
 @Graphics and UI Framework X
 
 
 sdbd
-setup-mobile
 %end
 
 
diff --git a/fixtures/ks_files/armv7l.ks b/fixtures/ks_files/armv7l.ks
index cd10b70..e66ab74 100755
--- a/fixtures/ks_files/armv7l.ks
+++ b/fixtures/ks_files/armv7l.ks
@@ -1,29 +1,27 @@
-# -*-mic2-options-*- -f loop --pack-to=@NAME@.tar.gz -*-mic2-options-*-
+# -*-mic2-options-*- -f loop -A armv7l --pack-to=@NAME@.tar.gz -*-mic2-options-*-
 
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/Los_Angeles
 
-# Partitions: size unit is MB
 part /boot --size=64 --ondisk mmcblk0p --fstype=ext4 --label=boot
-part / --size=256 --ondisk mmcblk0p --fstype=ext4 --label=platform
+part / --size 848 --ondisk sda --fstype=ext3 --label platform
 
 rootpw tizen 
-bootloader  --timeout=0  --append="rootdelay=5"   
+bootloader  --timeout=0  --append="rootdelay=5 security=none"
 
-desktop --autologinuser=root  
-user --name root  --groups audio,video --password ''
+desktop --autologinuser=tizen
+user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/armv7l/packages/ --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/armv7l/packages/ --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-base-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/source/ --save --source --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/source/  --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base-source --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main-source --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
 
 %packages
-shadow-utils
-kernel*
 coreutils
 bash
+rpm
 %end
 
 %attachment
diff --git a/fixtures/ks_files/armv7l_cpio.ks b/fixtures/ks_files/armv7l_cpio.ks
index c5ba740..f39caba 100644
--- a/fixtures/ks_files/armv7l_cpio.ks
+++ b/fixtures/ks_files/armv7l_cpio.ks
@@ -1,4 +1,4 @@
-# -*-mic2-options-*- -f loop --pack-to=@NAME@.tar.gz -*-mic2-options-*-
+# -*-mic2-options-*- -f loop -A armv7l --pack-to=@NAME@.tar.gz -*-mic2-options-*-
 
 lang en_US.UTF-8
 keyboard us
@@ -14,14 +14,13 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=root  
 user --name root  --groups audio,video --password ''
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/armv7l/packages/ --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/armv7l/packages/ --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-base-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/source/ --save --source --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/source/  --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base-source --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main-source --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/source/  --save --source --gpgkey=0 --ssl_verify=no
 
 %packages
 shadow-utils
-kernel*
 coreutils
 bash
 %end
diff --git a/fixtures/ks_files/armv7l_with_arch.ks b/fixtures/ks_files/armv7l_with_arch.ks
index 5110574..bac6cbd 100755
--- a/fixtures/ks_files/armv7l_with_arch.ks
+++ b/fixtures/ks_files/armv7l_with_arch.ks
@@ -14,21 +14,14 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=root  
 user --name root  --groups audio,video --password ''
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/@ARCH@/packages/ --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/@ARCH@/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-3.0.m3-3.0 --baseurl=http://download.tizen.org/releases/milestone/tizen/3.0.m3/3.0.m3-base/tizen-3.0-base_20170619.1/repos/@ARCH@/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-3.0.m3-mobile --baseurl=http://download.tizen.org/releases/milestone/tizen/3.0.m3/3.0.m3-mobile/tizen-3.0-mobile_20170627.1/repos/emulator32-wayland/packages/ --save --gpgkey=0 --ssl_verify=no
 
 %packages
-shadow-utils
-kernel*
-coreutils
 bash
 %end
 
 %attachment
-preos-runtime
-bootstub-bb
-/boot/cmdline
-/boot/vmlinuz-*
 %end
 
 %post
diff --git a/fixtures/ks_files/env_section.ks b/fixtures/ks_files/env_section.ks
index d34be17..6253794 100755
--- a/fixtures/ks_files/env_section.ks
+++ b/fixtures/ks_files/env_section.ks
@@ -12,8 +12,8 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 
 %env
 VALUE1=0x1000
diff --git a/fixtures/ks_files/error_auto.ks b/fixtures/ks_files/error_auto.ks
index 4809716..61280eb 100755
--- a/fixtures/ks_files/error_auto.ks
+++ b/fixtures/ks_files/error_auto.ks
@@ -15,8 +15,8 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 
 %packages
 
diff --git a/fixtures/ks_files/error_ks_with_chinese.ks b/fixtures/ks_files/error_ks_with_chinese.ks
index ab9a638..7bc817a 100755
--- a/fixtures/ks_files/error_ks_with_chinese.ks
+++ b/fixtures/ks_files/error_ks_with_chinese.ks
@@ -16,8 +16,8 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 
 %packages
 
diff --git a/fixtures/ks_files/error_no_package.ks b/fixtures/ks_files/error_no_package.ks
index 2455ca9..8f61059 100755
--- a/fixtures/ks_files/error_no_package.ks
+++ b/fixtures/ks_files/error_no_package.ks
@@ -1,4 +1,4 @@
-# -*-mic2-options-*- -f loop --pack-to=@NAME@.zip -*-mic2-options-*-
+# -*-mic2-options-*- -f loop -A i686 --pack-to=@NAME@.zip -*-mic2-options-*-
 
 # 
 # Do not Edit! Generated by:
@@ -16,8 +16,8 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 
 %post
 echo 'kickstart post script start'
diff --git a/fixtures/ks_files/error_package.ks b/fixtures/ks_files/error_package.ks
index 836e0f6..71af213 100755
--- a/fixtures/ks_files/error_package.ks
+++ b/fixtures/ks_files/error_package.ks
@@ -16,8 +16,8 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 
 %packages
 
diff --git a/fixtures/ks_files/error_repo.ks b/fixtures/ks_files/error_repo.ks
index d079420..1666422 100755
--- a/fixtures/ks_files/error_repo.ks
+++ b/fixtures/ks_files/error_repo.ks
@@ -16,8 +16,8 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/download.tizendev.org/not-exists/ --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/download.tizendev.org/not-exist/ --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizendev.org/not-exists/ --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizendev.org/not-exist/ --save --gpgkey=0 --ssl_verify=no
 
 %packages
 
diff --git a/fixtures/ks_files/handset_blackbay.ks b/fixtures/ks_files/handset_blackbay.ks
index 0fc3b24..22fd68a 100755
--- a/fixtures/ks_files/handset_blackbay.ks
+++ b/fixtures/ks_files/handset_blackbay.ks
@@ -12,15 +12,14 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-base-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/source/ --save --source --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base-source --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main-source --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
 bash
-kernel*
 rpm
 %end
 
diff --git a/fixtures/ks_files/handset_blackbay_copy_kernel.ks b/fixtures/ks_files/handset_blackbay_copy_kernel.ks
new file mode 100755
index 0000000..3e5c7da
--- /dev/null
+++ b/fixtures/ks_files/handset_blackbay_copy_kernel.ks
@@ -0,0 +1,43 @@
+# -*-mic2-options-*- -f loop --pack-to=@NAME@-rs.zip -*-mic2-options-*-
+
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/Los_Angeles
+
+part / --size 848 --ondisk sda --fstype=ext3 --label platform
+
+rootpw tizen 
+bootloader  --timeout=0  --append="rootdelay=5 security=none"
+
+desktop --autologinuser=tizen  
+user --name tizen  --groups audio,video --password 'tizen'
+
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base-source --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main-source --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
+
+%packages
+coreutils
+bash
+rpm
+emulator-kernel*
+%end
+
+%attachment
+/boot/System.map-4.4.35-i386
+/boot/bzImage.i386
+/boot/config-4.4.35-i386
+/boot/initramfs.i386
+%end
+
+%post
+# Set environment for launchpad daemon. Fix TDIST-264
+cat > /etc/sysconfig/launchpad <<EOF
+DISPLAY=:0
+EOF
+%end
+
+%post --nochroot
+
+%end
diff --git a/fixtures/ks_files/handset_blackbay_fs.ks b/fixtures/ks_files/handset_blackbay_fs.ks
index e7b754c..a9ffb58 100755
--- a/fixtures/ks_files/handset_blackbay_fs.ks
+++ b/fixtures/ks_files/handset_blackbay_fs.ks
@@ -12,13 +12,12 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
 bash
-kernel*
 %end
 
 %attachment
diff --git a/fixtures/ks_files/handset_blackbay_fs_d_v_i.ks b/fixtures/ks_files/handset_blackbay_fs_d_v_i.ks
index 7451607..89f6c7d 100644
--- a/fixtures/ks_files/handset_blackbay_fs_d_v_i.ks
+++ b/fixtures/ks_files/handset_blackbay_fs_d_v_i.ks
@@ -12,13 +12,12 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
 bash
-kernel*
 %end
 
 %attachment
diff --git a/fixtures/ks_files/handset_blackbay_high_version.ks b/fixtures/ks_files/handset_blackbay_high_version.ks
new file mode 100755
index 0000000..30eab14
--- /dev/null
+++ b/fixtures/ks_files/handset_blackbay_high_version.ks
@@ -0,0 +1,32 @@
+# -*-mic2-options-*- -f loop --pack-to=@NAME@-rs.zip -*-mic2-options-*-
+
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/Los_Angeles
+
+part / --size 848 --ondisk sda --fstype=ext3 --label platform
+
+rootpw tizen 
+bootloader  --timeout=0  --append="rootdelay=5 security=none"
+
+desktop --autologinuser=tizen  
+user --name tizen  --groups audio,video --password 'tizen'
+
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base-low-version --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180518.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+
+%packages
+filesystem
+rpm
+%end
+
+%attachment
+%end
+
+%post
+%end
+
+%post --nochroot
+
+%end
diff --git a/fixtures/ks_files/handset_blackbay_http_tpk_repo.ks b/fixtures/ks_files/handset_blackbay_http_tpk_repo.ks
index e400852..7f1fdd8 100755
--- a/fixtures/ks_files/handset_blackbay_http_tpk_repo.ks
+++ b/fixtures/ks_files/handset_blackbay_http_tpk_repo.ks
@@ -12,14 +12,13 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-tpk_repo --name=tpkurl --baseurl=http://10.113.136.109/TPK
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+tpk_repo --name=tpkurl --baseurl=http://download.tizen.org/tools/repos/TPK/
 
 %packages
 coreutils
 bash
-kernel*
 rpm
 %end
 %tpk_packages
diff --git a/fixtures/ks_files/handset_blackbay_local_tpk_repo.ks b/fixtures/ks_files/handset_blackbay_local_tpk_repo.ks
index 3ca7a18..654c4a8 100755
--- a/fixtures/ks_files/handset_blackbay_local_tpk_repo.ks
+++ b/fixtures/ks_files/handset_blackbay_local_tpk_repo.ks
@@ -12,14 +12,13 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 tpk_repo --name=build --baseurl=file:///home/build/tmp/mic/tpk
 
 %packages
 coreutils
 bash
-kernel*
 rpm
 %end
 %tpk_packages
diff --git a/fixtures/ks_files/handset_blackbay_localrepo.ks b/fixtures/ks_files/handset_blackbay_localrepo.ks
index 6e64651..71e010e 100644
--- a/fixtures/ks_files/handset_blackbay_localrepo.ks
+++ b/fixtures/ks_files/handset_blackbay_localrepo.ks
@@ -18,5 +18,4 @@ repo --name=local_main --baseurl=file:///home/build/tmp/mic/cache/packages/Tizen
 %packages
 coreutils
 bash
-kernel*
 %end
diff --git a/fixtures/ks_files/handset_blackbay_localrepo_test.ks b/fixtures/ks_files/handset_blackbay_localrepo_test.ks
index f78838f..4126192 100644
--- a/fixtures/ks_files/handset_blackbay_localrepo_test.ks
+++ b/fixtures/ks_files/handset_blackbay_localrepo_test.ks
@@ -18,5 +18,4 @@ repo --name=local_base --baseurl=file:///home/build/tmp/mic/cache/packages/Tizen
 %packages
 coreutils
 bash
-kernel*
 %end
diff --git a/fixtures/ks_files/handset_blackbay_no_mountpoint.ks b/fixtures/ks_files/handset_blackbay_no_mountpoint.ks
index 2091097..64cea89 100755
--- a/fixtures/ks_files/handset_blackbay_no_mountpoint.ks
+++ b/fixtures/ks_files/handset_blackbay_no_mountpoint.ks
@@ -13,13 +13,12 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
 bash
-kernel*
 rpm
 %end
 
diff --git a/fixtures/ks_files/handset_blackbay_package_constPtr.ks b/fixtures/ks_files/handset_blackbay_package_constPtr.ks
index b1f3aa1..dd21cd6 100755
--- a/fixtures/ks_files/handset_blackbay_package_constPtr.ks
+++ b/fixtures/ks_files/handset_blackbay_package_constPtr.ks
@@ -12,15 +12,14 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-base-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/source/ --save --source --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base-source --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main-source --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
 bash
-kernel*
 rpm.i586
 %end
 
diff --git a/fixtures/ks_files/handset_blackbay_partition_expand.ks b/fixtures/ks_files/handset_blackbay_partition_expand.ks
index e6a380b..5c923bf 100755
--- a/fixtures/ks_files/handset_blackbay_partition_expand.ks
+++ b/fixtures/ks_files/handset_blackbay_partition_expand.ks
@@ -1,4 +1,4 @@
-# -*-mic2-options-*- -f loop --pack-to=@NAME@-rs.zip -*-mic2-options-*-
+# -*-mic2-options-*- -f loop  --pack-to=@NAME@-rs.zip -*-mic2-options-*-
 
 lang en_US.UTF-8
 keyboard us
@@ -12,15 +12,14 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-base-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/source/ --save --source --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base-source --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main-source --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
 bash
-kernel*
 rpm
 %end
 
diff --git a/fixtures/ks_files/handset_blackbay_priority.ks b/fixtures/ks_files/handset_blackbay_priority.ks
index 8ff01ea..18248de 100755
--- a/fixtures/ks_files/handset_blackbay_priority.ks
+++ b/fixtures/ks_files/handset_blackbay_priority.ks
@@ -1,4 +1,4 @@
-# -*-mic2-options-*- -f loop --pack-to=@NAME@-rs.zip -*-mic2-options-*-
+# -*-mic2-options-*- -f loop  --pack-to=@NAME@-rs.zip -*-mic2-options-*-
 
 lang en_US.UTF-8
 keyboard us
@@ -12,15 +12,14 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 repo --name=tmp --baseurl=file:///home/build/tmp1/  --priority=1
 repo --name=tmp2 --baseurl=file:///home/build/tmp2/ --priority=2
 
 %packages
 coreutils
 bash
-kernel*
 rpm
 fake
 %end
diff --git a/fixtures/ks_files/handset_blackbay_runscript.ks b/fixtures/ks_files/handset_blackbay_runscript.ks
index 6434be2..e0d7430 100644
--- a/fixtures/ks_files/handset_blackbay_runscript.ks
+++ b/fixtures/ks_files/handset_blackbay_runscript.ks
@@ -1,4 +1,4 @@
-# -*-mic2-options-*- -f loop --pack-to=@NAME@-rs.zip -*-mic2-options-*-
+# -*-mic2-options-*- -f loop  --pack-to=@NAME@-rs.zip -*-mic2-options-*-
 
 lang en_US.UTF-8
 keyboard us
@@ -12,15 +12,14 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-base-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/source/ --save --source --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base-source --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main-source --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
 bash
-kernel*
 rpm
 %end
 
diff --git a/fixtures/ks_files/handset_blackbay_script_error.ks b/fixtures/ks_files/handset_blackbay_script_error.ks
index 8d2954f..977fdfc 100755
--- a/fixtures/ks_files/handset_blackbay_script_error.ks
+++ b/fixtures/ks_files/handset_blackbay_script_error.ks
@@ -1,4 +1,4 @@
-# -*-mic2-options-*- -f loop --pack-to=@NAME@-rs.zip -*-mic2-options-*-
+# -*-mic2-options-*- -f loop -A i686 --pack-to=@NAME@-rs.zip -*-mic2-options-*-
 
 lang en_US.UTF-8
 keyboard us
@@ -12,23 +12,18 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-base-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/source/ --save --source --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main-source --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base-source --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main-source --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
 bash
-kernel*
 rpm
 %end
 
 %attachment
-preos-runtime
-bootstub-bb
-/boot/cmdline
-/boot/vmlinuz-*
 %end
 
 %post
diff --git a/fixtures/ks_files/handset_blackbay_test_repo.ks b/fixtures/ks_files/handset_blackbay_test_repo.ks
index eb819c3..6d1775a 100755
--- a/fixtures/ks_files/handset_blackbay_test_repo.ks
+++ b/fixtures/ks_files/handset_blackbay_test_repo.ks
@@ -1,4 +1,4 @@
-# -*-mic2-options-*- -f loop --pack-to=@NAME@-rs.zip -*-mic2-options-*-
+# -*-mic2-options-*- -f loop  --pack-to=@NAME@-rs.zip -*-mic2-options-*-
 
 lang en_US.UTF-8
 keyboard us
@@ -12,15 +12,14 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-#repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-#repo --name=Tizen-base-source --baseurl=http://download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/source/ --save --source --gpgkey=0 --ssl_verify=no
-#repo --name=Tizen-main-source --baseurl=http://download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/source/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+#repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+#repo --name=Tizen-base-source --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
+#repo --name=Tizen-main-source --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/source/ --save --source --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
 bash
-kernel*
 rpm
 %end
 
diff --git a/fixtures/ks_files/handset_blackbay_with_encoded_passwd.ks b/fixtures/ks_files/handset_blackbay_with_encoded_passwd.ks
index 77e6744..e03deca 100755
--- a/fixtures/ks_files/handset_blackbay_with_encoded_passwd.ks
+++ b/fixtures/ks_files/handset_blackbay_with_encoded_passwd.ks
@@ -12,37 +12,11 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://testspec:pass%40%2C%3A%25@10.113.136.109/repo-protected/tizen/releases/2.2/latest/repos/tizen-base/ia32/packages/ --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://testspec:pass%40%2C%3A%25@10.113.136.109/repo-protected/tizen/releases/2.2/latest/repos/tizen-main/ia32/packages/ --save  --ssl_verify=no
-
-%pre
-echo 'helo'
-mkdir -p ~/lhh
-%end
-
-%prepackages
-bash
-%end
+repo --name=Tizen-base --baseurl=http://testspec:pass%40%2C%3A%25@localhost:8881/tizen-base/ia32/packages/ --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://testspec:pass%40%2C%3A%25@localhost:8881/tizen-main/ia32/packages/ --save  --ssl_verify=no
 
 %packages
-coreutils
 bash
-kernel*
-rpm
-%end
-
-%attachment
-preos-runtime
-bootstub-bb
-/boot/cmdline
-/boot/vmlinuz-*
-%end
-
-%post
-# Set environment for launchpad daemon. Fix TDIST-264
-cat > /etc/sysconfig/launchpad <<EOF
-DISPLAY=:0
-EOF
 %end
 
 %post --nochroot
diff --git a/fixtures/ks_files/handset_blackbay_with_passwd.ks b/fixtures/ks_files/handset_blackbay_with_passwd.ks
index 79dcce9..2dfdde4 100755
--- a/fixtures/ks_files/handset_blackbay_with_passwd.ks
+++ b/fixtures/ks_files/handset_blackbay_with_passwd.ks
@@ -12,28 +12,11 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://test:123456@10.113.136.109/repo-protected/tizen/releases/2.2/latest/repos/tizen-base/ia32/packages/ --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://test:123456@10.113.136.109/repo-protected/tizen/releases/2.2/latest/repos/tizen-main/ia32/packages/ --save  --ssl_verify=no
+repo --name=Tizen-base-local --baseurl=http://test:123456@localhost:8881/tizen-base/ia32/packages/ --ssl_verify=no
+repo --name=Tizen-main-local --baseurl=http://test:123456@localhost:8881/tizen-main/ia32/packages/ --save  --ssl_verify=no
 
 %packages
-coreutils
 bash
-kernel*
-rpm
-%end
-
-%attachment
-preos-runtime
-bootstub-bb
-/boot/cmdline
-/boot/vmlinuz-*
-%end
-
-%post
-# Set environment for launchpad daemon. Fix TDIST-264
-cat > /etc/sysconfig/launchpad <<EOF
-DISPLAY=:0
-EOF
 %end
 
 %post --nochroot
diff --git a/fixtures/ks_files/handset_blackbay_with_separate_passwd.ks b/fixtures/ks_files/handset_blackbay_with_separate_passwd.ks
index 842842a..29b1f00 100755
--- a/fixtures/ks_files/handset_blackbay_with_separate_passwd.ks
+++ b/fixtures/ks_files/handset_blackbay_with_separate_passwd.ks
@@ -12,28 +12,11 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo-protected/tizen/releases/2.2/latest/repos/tizen-base/ia32/packages/ --ssl_verify=no --user=testspec --passwd=pass@,:%
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo-protected/tizen/releases/2.2/latest/repos/tizen-main/ia32/packages/ --save  --ssl_verify=no --user=testspec --passwd=pass@,:%
+repo --name=Tizen-base-local --baseurl=http://localhost:8881/tizen-base/ia32/packages/ --ssl_verify=no --user=testspec --passwd=pass@,:%
+repo --name=Tizen-main-local --baseurl=http://localhost:8881/tizen-main/ia32/packages/ --save  --ssl_verify=no --user=testspec --passwd=pass@,:%
 
 %packages
-coreutils
 bash
-kernel*
-rpm
-%end
-
-%attachment
-preos-runtime
-bootstub-bb
-/boot/cmdline
-/boot/vmlinuz-*
-%end
-
-%post
-# Set environment for launchpad daemon. Fix TDIST-264
-cat > /etc/sysconfig/launchpad <<EOF
-DISPLAY=:0
-EOF
 %end
 
 %post --nochroot
diff --git a/fixtures/ks_files/ivi-2.0-alpha-debuginfo.ks b/fixtures/ks_files/ivi-2.0-alpha-debuginfo.ks
index c79b269..9e9d0e4 100755
--- a/fixtures/ks_files/ivi-2.0-alpha-debuginfo.ks
+++ b/fixtures/ks_files/ivi-2.0-alpha-debuginfo.ks
@@ -15,8 +15,8 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=base  --baseurl=http://10.113.136.109/repo/download.tizen.org/snapshots/tizen/ivi/latest/repos/atom/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=base-debug --baseurl=http://10.113.136.109/repo/download.tizen.org/snapshots/tizen/ivi/latest/repos/atom/debug/ --save --source --gpgkey=0 --ssl_verify=no
+repo --name=base  --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=base-debug --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/debug/ --save --source --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
diff --git a/fixtures/ks_files/ivi-mbr-i586.ks b/fixtures/ks_files/ivi-mbr-i586.ks
index a511e7a..615d360 100755
--- a/fixtures/ks_files/ivi-mbr-i586.ks
+++ b/fixtures/ks_files/ivi-mbr-i586.ks
@@ -20,7 +20,7 @@ user --name tizen  --groups audio,video,weston-launch --password 'tizen'
 
 installerfw_plugins "bootloader,fstab"
 
-repo --name=ivi --baseurl=http://10.113.136.109/repo/download.tizen.org/snapshots/tizen/ivi/latest/repos/atom/packages/
+repo --name=ivi --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/
 
 %packages
 
diff --git a/fixtures/ks_files/ivi.ks b/fixtures/ks_files/ivi.ks
index c71f9f9..ab81d98 100755
--- a/fixtures/ks_files/ivi.ks
+++ b/fixtures/ks_files/ivi.ks
@@ -15,7 +15,8 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base-source --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/source/ --save --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
diff --git a/fixtures/ks_files/ivi_624.ks b/fixtures/ks_files/ivi_624.ks
index a14817e..f6cb19d 100755
--- a/fixtures/ks_files/ivi_624.ks
+++ b/fixtures/ks_files/ivi_624.ks
@@ -15,7 +15,7 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen  
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=base  --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=base  --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/  --save --gpgkey=0 --ssl_verify=no
 
 %packages --ignoremissing
 coreutils
diff --git a/fixtures/ks_files/ivi_broken_content_bootstrap.ks b/fixtures/ks_files/ivi_broken_content_bootstrap.ks
index 7555ccb..ab2fab2 100755
--- a/fixtures/ks_files/ivi_broken_content_bootstrap.ks
+++ b/fixtures/ks_files/ivi_broken_content_bootstrap.ks
@@ -15,11 +15,10 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-ivi-new --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repo-ivi-broken-content-bootstrap/atom/packages/ --ssl_verify=no --gpgkey=0
+repo --name=Tizen-ivi-new --baseurl=http://download.tizen.org/tools/repos/repo-ivi-broken-content-bootstrap/atom/packages/ --ssl_verify=no --gpgkey=0
 
 %packages --ignoremissing
 coreutils
 bash
 tzdata
-kernel*
 %end
diff --git a/fixtures/ks_files/ivi_four_partition_gpt.ks b/fixtures/ks_files/ivi_four_partition_gpt.ks
index a5b4a1b..cd768cf 100755
--- a/fixtures/ks_files/ivi_four_partition_gpt.ks
+++ b/fixtures/ks_files/ivi_four_partition_gpt.ks
@@ -17,7 +17,7 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"  --ptable=gpt
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=base  --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base  --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
 
 %packages --ignoremissing
 coreutils
diff --git a/fixtures/ks_files/ivi_four_partition_mbr.ks b/fixtures/ks_files/ivi_four_partition_mbr.ks
index 59e3322..ec41082 100755
--- a/fixtures/ks_files/ivi_four_partition_mbr.ks
+++ b/fixtures/ks_files/ivi_four_partition_mbr.ks
@@ -17,7 +17,7 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=base  --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base  --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
 
 %packages --ignoremissing
 coreutils
diff --git a/fixtures/ks_files/ivi_gpt_with_part-type.ks b/fixtures/ks_files/ivi_gpt_with_part-type.ks
index 9c9bc06..884f81e 100755
--- a/fixtures/ks_files/ivi_gpt_with_part-type.ks
+++ b/fixtures/ks_files/ivi_gpt_with_part-type.ks
@@ -18,7 +18,7 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4"   --ptable=gpt
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video,weston-launch --password 'tizen'
 
-repo --name=base  --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base  --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
diff --git a/fixtures/ks_files/ivi_invalid_content_mic-bootstrap.ks b/fixtures/ks_files/ivi_invalid_content_mic-bootstrap.ks
index 9c736a6..1b885b6 100755
--- a/fixtures/ks_files/ivi_invalid_content_mic-bootstrap.ks
+++ b/fixtures/ks_files/ivi_invalid_content_mic-bootstrap.ks
@@ -15,7 +15,7 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-ivi-new --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repo-ivi-broken-content-bootstrap/atom/packages/  --ssl_verify=no --gpgkey=0
+repo --name=Tizen-ivi-new --baseurl=http://download.tizen.org/tools/repos/repo-ivi-broken-content-bootstrap/atom/packages/  --ssl_verify=no --gpgkey=0
 
 %packages --ignoremissing
 coreutils
diff --git a/fixtures/ks_files/ivi_no_mountpoint.ks b/fixtures/ks_files/ivi_no_mountpoint.ks
index d69b51e..d9462a5 100755
--- a/fixtures/ks_files/ivi_no_mountpoint.ks
+++ b/fixtures/ks_files/ivi_no_mountpoint.ks
@@ -15,7 +15,7 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=base  --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base  --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
diff --git a/fixtures/ks_files/ivi_no_partition.ks b/fixtures/ks_files/ivi_no_partition.ks
index e74900a..37d04b4 100755
--- a/fixtures/ks_files/ivi_no_partition.ks
+++ b/fixtures/ks_files/ivi_no_partition.ks
@@ -13,7 +13,7 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=base  --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base  --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
diff --git a/fixtures/ks_files/ivi_packages.ks b/fixtures/ks_files/ivi_packages.ks
index fd36b83..be22722 100755
--- a/fixtures/ks_files/ivi_packages.ks
+++ b/fixtures/ks_files/ivi_packages.ks
@@ -15,7 +15,7 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=base  --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base  --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
 
 %packages
 #@Base System
diff --git a/fixtures/ks_files/ivi_syslinux_problem.ks b/fixtures/ks_files/ivi_syslinux_problem.ks
index 685b3c7..c583a53 100755
--- a/fixtures/ks_files/ivi_syslinux_problem.ks
+++ b/fixtures/ks_files/ivi_syslinux_problem.ks
@@ -15,7 +15,7 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-ivi --baseurl=http://10.113.136.109/repo/download.tizen.org/ivi/syslinux_problem_rep/repos/tizen/ia32/packages/ --ssl_verify=no --gpgkey=0
+repo --name=Tizen-ivi --baseurl=http://download.tizen.org/tools/repos/ivi/syslinux_problem_rep/repos/tizen/ia32/packages/ --ssl_verify=no --gpgkey=0
 
 %packages --ignoremissing
 coreutils
diff --git a/fixtures/ks_files/ivi_with_active_partition.ks b/fixtures/ks_files/ivi_with_active_partition.ks
index ef836c6..2878f96 100755
--- a/fixtures/ks_files/ivi_with_active_partition.ks
+++ b/fixtures/ks_files/ivi_with_active_partition.ks
@@ -15,7 +15,7 @@ bootloader  --timeout=0  --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=base  --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base  --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
diff --git a/fixtures/ks_files/ivi_with_active_partition_gpt.ks b/fixtures/ks_files/ivi_with_active_partition_gpt.ks
index d6c1cc0..666ca05 100755
--- a/fixtures/ks_files/ivi_with_active_partition_gpt.ks
+++ b/fixtures/ks_files/ivi_with_active_partition_gpt.ks
@@ -15,7 +15,7 @@ bootloader  --timeout=0  --ptable=gpt --append="rootwait rootfstype=ext4 quiet"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=base  --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base  --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
 
 %packages --ignoremissing
 coreutils
diff --git a/fixtures/ks_files/ivi_with_installerfw.ks b/fixtures/ks_files/ivi_with_installerfw.ks
index 603e49b..f5319ce 100755
--- a/fixtures/ks_files/ivi_with_installerfw.ks
+++ b/fixtures/ks_files/ivi_with_installerfw.ks
@@ -20,7 +20,7 @@ user --name tizen  --groups audio,video,weston-launch --password 'tizen'
 
 installerfw_plugins "bootloader"
 
-repo --name=base  --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base  --baseurl=http://download.tizen.org/releases/milestone/tizen/ivi-3.0/tizen-3.0-ivi_20150201.3/repos/atom/packages/ --save --gpgkey=0 --ssl_verify=no
 
 %packages
 coreutils
diff --git a/fixtures/ks_files/mobile_exclude.ks b/fixtures/ks_files/mobile_exclude.ks
index b06ffa8..9fc4731 100644
--- a/fixtures/ks_files/mobile_exclude.ks
+++ b/fixtures/ks_files/mobile_exclude.ks
@@ -8,8 +8,7 @@
 lang en_US.UTF-8
 keyboard us
 timezone --utc Asia/Seoul
-part /boot --fstype="ext4" --size=32 --ondisk=mmcblk0 --active --label boot --fsoptions=defaults,noatime --exclude-from-image
-part /lib/modules --fstype="ext4" --size=20 --ondisk=mmcblk0 --active --label modules --fsoptions=defaults,noatime --exclude-from-image
+part /lib/modules --fstype="ext4" --size=25 --ondisk=mmcblk0 --active --label modules --fsoptions=defaults,noatime --exclude-from-image
 
 rootpw tizen 
 xconfig --startxonboot
@@ -19,18 +18,18 @@ desktop --autologinuser=guest
 user --name guest  --groups audio,video --password 'tizen'
 
 
-repo --name=mobile-wayland_armv7l --baseurl=http://10.113.136.109/repo/download.tizen.org/snapshots/tizen/mobile/tizen-mobile_20160810.1/repos/arm-wayland/packages/ --ssl_verify=no
+repo --name=mobile-wayland_armv7l --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/ --ssl_verify=no
 
 %packages
 
-@Mobile Boot Odroid U3
+@Mobile Boot TM1
 
 
 %end
 
 
 %attachment
-/var/tmp/u-boot/u-boot-mmc.bin
+/boot/u-boot/u-boot-mmc.bin
 %end
 
 %post
diff --git a/fixtures/ks_files/obsolete_test_one.ks b/fixtures/ks_files/obsolete_test_one.ks
index bd080d6..5d020a9 100755
--- a/fixtures/ks_files/obsolete_test_one.ks
+++ b/fixtures/ks_files/obsolete_test_one.ks
@@ -12,7 +12,7 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 repo --name=base2 --baseurl=file:///home/build/tmp_repo2/
 %packages
 A
diff --git a/fixtures/ks_files/obsolete_test_two.ks b/fixtures/ks_files/obsolete_test_two.ks
index 29fbb10..0a9d564 100755
--- a/fixtures/ks_files/obsolete_test_two.ks
+++ b/fixtures/ks_files/obsolete_test_two.ks
@@ -12,7 +12,7 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 repo --name=base2 --baseurl=file:///home/build/tmp_repo1/
 %packages
 A
diff --git a/fixtures/ks_files/qcow_image.ks b/fixtures/ks_files/qcow_image.ks
index b24429e..bb94907 100755
--- a/fixtures/ks_files/qcow_image.ks
+++ b/fixtures/ks_files/qcow_image.ks
@@ -18,7 +18,8 @@ desktop --autologinuser=guest
 user --name guest  --groups audio,video --password 'tizen'
 
 
-repo --name=common-emulator-wayland_i586 --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/common/latest/repos/emulator32-wayland/packages/ --ssl_verify=no
+repo --name=common-emulator-wayland --baseurl=http://download.tizen.org/releases/milestone/tizen/common-3.0.2015.Q2/tizen-3.0.2015.Q2-common_20150630.1/repos/emulator32-wayland/packages/ --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 
 %packages
 
@@ -26,7 +27,6 @@ repo --name=common-emulator-wayland_i586 --baseurl=http://10.113.136.109/repo/do
 @Common Base
 @Generic Console Tools
 @Generic Packaging
-@Common Packaging
 @Generic Adaptation
 @Generic Wayland
 @Common Wayland
@@ -40,10 +40,8 @@ repo --name=common-emulator-wayland_i586 --baseurl=http://10.113.136.109/repo/do
 @Generic Crosswalk
 @Common Crosswalk
 @Generic Qt5
-@Common Qt5
 @Generic Multimedia Intel
 
-kernel-profile-common
 
 sdbd
 system-plugin-emulator
diff --git a/fixtures/ks_files/qcow_image_tpk_http_repo.ks b/fixtures/ks_files/qcow_image_tpk_http_repo.ks
index 65f73a0..7b695c3 100755
--- a/fixtures/ks_files/qcow_image_tpk_http_repo.ks
+++ b/fixtures/ks_files/qcow_image_tpk_http_repo.ks
@@ -18,8 +18,9 @@ desktop --autologinuser=guest
 user --name guest  --groups audio,video --password 'tizen'
 
 
-repo --name=common-emulator-wayland_i586 --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/daily/tizen/common/latest/repos/emulator32-wayland/packages/ --ssl_verify=no
-tpk_repo --name=sometpk --baseurl=http://10.113.136.109/TPK/
+repo --name=common-emulator-wayland --baseurl=http://download.tizen.org/releases/milestone/tizen/common-3.0.2015.Q2/tizen-3.0.2015.Q2-common_20150630.1/repos/emulator32-wayland/packages/ --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+tpk_repo --name=sometpk --baseurl=http://download.tizen.org/tools/repos/TPK/
 
 %packages
 
diff --git a/fixtures/ks_files/scriptlet_error.ks b/fixtures/ks_files/scriptlet_error.ks
index f956aee..cf075ac 100755
--- a/fixtures/ks_files/scriptlet_error.ks
+++ b/fixtures/ks_files/scriptlet_error.ks
@@ -12,8 +12,8 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=main-2.2 --baseurl=http://download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=base-2.2 --baseurl=http://download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/ --save --gpgkey=0 --ssl_verify=no
 repo --name=myrepo --baseurl=file:///home/build/scriptlet
 
 %packages
diff --git a/fixtures/ks_files/strict_mode.ks b/fixtures/ks_files/strict_mode.ks
index 0ea66b8..c69f751 100755
--- a/fixtures/ks_files/strict_mode.ks
+++ b/fixtures/ks_files/strict_mode.ks
@@ -12,8 +12,8 @@ bootloader  --timeout=0  --append="rootdelay=5 security=none"
 desktop --autologinuser=tizen
 user --name tizen  --groups audio,video --password 'tizen'
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-base/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.2/tizen-2.2_20130719.3/repos/tizen-main/ia32/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/  --save --gpgkey=0 --ssl_verify=no
 repo --name=myrepo --baseurl=file:///home/build/strict_mode
 
 %packages
diff --git a/fixtures/ks_files/whole_rd_210.ks b/fixtures/ks_files/whole_rd_210.ks
index d1c0dd0..50eee03 100755
--- a/fixtures/ks_files/whole_rd_210.ks
+++ b/fixtures/ks_files/whole_rd_210.ks
@@ -13,6 +13,7 @@ part / --size=800 --ondisk mmcblk0p --fstype=ext4 --label=platform
 part /opt/ --size=200 --ondisk mmcblk0p --fstype=ext4 --label=data
 # UMS partition
 part /opt/usr/ --size=300 --ondisk mmcblk0p --fstype=ext4 --label=ums
+part /lib/modules --fstype="ext4" --size=25 --ondisk=mmcblk0 --active --label modules --fsoptions=defaults,noatime
 
 rootpw tizen
 bootloader  --timeout=0  --append="rootdelay=5"
@@ -20,14 +21,16 @@ bootloader  --timeout=0  --append="rootdelay=5"
 desktop --autologinuser=root
 user --name root  --groups audio,video --password ''
 
-repo --name=Tizen-base --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.0/latest/repos/base/ia32/packages/ --save --gpgkey=0 --ssl_verify=no
-repo --name=Tizen-main --baseurl=http://10.113.136.109/repo/download.tizen.org/releases/2.0/latest/repos/main/ia32/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/ --save --gpgkey=0 --ssl_verify=no
+repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/ --save --gpgkey=0 --ssl_verify=no
 
 %packages
+artik530-raptor-linux-kernel
+artik530-raptor-linux-kernel-modules
+u-boot-artik530
 shadow-utils
 coreutils
 bash
-kernel*
 %end
 
 %prepackages
@@ -38,10 +41,11 @@ libattr
 %end
 
 %attachment
-preos-runtime
-bootstub-bb
-/boot/cmdline
-/boot/vmlinuz-*
+/boot/u-boot/bootloader.img
+/boot/u-boot/params.bin
+/boot/zImage
+/boot/s5p4418-artik530-raptor-rev00.dtb
+/boot/s5p4418-artik530-raptor-rev03.dtb
 %end
 %post
 echo 'kickstart post script start'