Update build and make_repo script for Mitaka_trusty

JIRA: COMPASS-396

Change-Id: I62ee005d16374daadc74de18d01c724eaa44be26
Signed-off-by: Yifei Xue <xueyifei@huawei.com>

diff --git a/build.sh b/build.sh
index 9f959b0..1825c62 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -78,7 +78,7 @@ function download_local()
 
 function download_packages()
 {
-     for i in $CENTOS_BASE $COMPASS_CORE $COMPASS_WEB $COMPASS_INSTALL $TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $UBUNTU_ISO \
+     for i in $CENTOS_BASE $COMPASS_CORE $COMPASS_WEB $COMPASS_INSTALL $TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $TRUSTY_MITAKA_PPA $UBUNTU_ISO \
               $CENTOS_ISO $CENTOS7_JUNO_PPA $CENTOS7_KILO_PPA $CENTOS7_LIBERTY_PPA $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG \
               $PIP_REPO $ANSIBLE_MODULE; do
 
@@ -120,9 +120,9 @@ function copy_file()
         cp $CACHE_DIR/`basename $TRUSTY_LIBERTY_PPA` $new/repos/cobbler/ubuntu/ppa/ -rf
     fi
 
-#    if [[  $TRUSTY_MITAKA_PPA ]]; then
-#        cp $CACHE_DIR/`basename $TRUSTY_MITAKA_PPA` $new/repos/cobbler/ubuntu/ppa/ -rf
-#    fi
+    if [[  $TRUSTY_MITAKA_PPA ]]; then
+        cp $CACHE_DIR/`basename $TRUSTY_MITAKA_PPA` $new/repos/cobbler/ubuntu/ppa/ -rf
+    fi
 
     if [[ $CENTOS_ISO ]]; then
         cp $CACHE_DIR/`basename $CENTOS_ISO` $new/repos/cobbler/centos/iso/ -rf

diff --git a/build/make_repo.sh b/build/make_repo.sh
index bebb506..4299868 100755 (executable)
--- a/build/make_repo.sh
+++ b/build/make_repo.sh
@@ -117,9 +117,9 @@ function make_repo()
         mkdir -p ${WORK_PATH}/work/tmp
         echo "${ansible_dir}"
         cp -rf ${ansible_dir}/roles/ ${WORK_PATH}/work/tmp/
-        if [[ -d ${ansible_dir}/openstack_${package_tag} && "`ls ${ansible_dir}/openstack_${package_tag}`" != "" ]]; then
-            cp -rf ${ansible_dir}/openstack_${package_tag}/* ${WORK_PATH}/work/tmp/roles/
-        fi 
+        if [[ -d ${ansible_dir}/openstack_${package_tag}/roles && "`ls ${ansible_dir}/openstack_${package_tag}`" != "" ]]; then
+            cp -rf ${ansible_dir}/openstack_${package_tag}/roles/* ${WORK_PATH}/work/tmp/roles/
+        fi
         ansible_dir_tmp=${WORK_PATH}/work/tmp/
     fi