summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2016-05-26 23:41:37 +0800
committerYifei Xue <xueyifei@huawei.com>2016-05-26 23:41:37 +0800
commit960de5048a1257b7a579bc9f313b198408804501 (patch)
tree2aa149a5c8110cb503f58093db550b72aa903e95
parent950dd51e26b2092129bda9acd4275198b60cf25b (diff)
Add centos7_mitaka_ppa and update the "build" script
JIRA: COMPASS-402 Change-Id: Ibaa186a36c4c4f05b6dad96d447bb52bfadee9a2 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
-rwxr-xr-xbuild.sh8
-rwxr-xr-xbuild/make_repo.sh2
2 files changed, 5 insertions, 5 deletions
diff --git a/build.sh b/build.sh
index 1825c62c..18e5c36e 100755
--- 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 4299868c..32853e99 100755
--- 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 \