Add centos7_mitaka_ppa and update the "build" script

JIRA: COMPASS-402

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

diff --git a/build.sh b/build.sh
index 1825c62..18e5c36 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -79,7 +79,7 @@ function download_local()
 function download_packages()
 {
      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 \
+              $CENTOS_ISO $CENTOS7_JUNO_PPA $CENTOS7_KILO_PPA $CENTOS7_LIBERTY_PPA $CENTOS7_MITAKA_PPA $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG \
               $PIP_REPO $ANSIBLE_MODULE; do
 
          if [[ ! $i ]]; then
@@ -140,9 +140,9 @@ function copy_file()
         cp $CACHE_DIR/`basename $CENTOS7_LIBERTY_PPA` $new/repos/cobbler/centos/ppa/ -rf
     fi
 
-#    if [[ $CENTOS7_MITAKA_PPA ]]; then
-#        cp $CACHE_DIR/`basename $CENTOS7_MITAKA_PPA` $new/repos/cobbler/centos/ppa/ -rf
-#    fi
+    if [[ $CENTOS7_MITAKA_PPA ]]; then
+        cp $CACHE_DIR/`basename $CENTOS7_MITAKA_PPA` $new/repos/cobbler/centos/ppa/ -rf
+    fi
 
     cp $CACHE_DIR/`basename $LOADERS` $new/ -rf || exit 1
     cp $CACHE_DIR/`basename $APP_PACKAGE` $new/app_packages/ -rf || exit 1

diff --git a/build/make_repo.sh b/build/make_repo.sh
index 4299868..32853e9 100755 (executable)
--- a/build/make_repo.sh
+++ b/build/make_repo.sh
@@ -207,7 +207,7 @@ function make_all_repo()
               --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server \
                                  dracut-config-rescue-033-241.el7_1.3 dracut-network-033-241.el7_1.3"
 
-    for opv in kilo liberty; do
+    for opv in kilo liberty mitaka; do
     make_repo --os-ver rhel7 --package-tag $opv \
               --ansible-dir $WORK_PATH/deploy/adapters/ansible \
               --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server \