From 1dde11d3b422f1c649244078c2b2ef945b0a0e2c Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Thu, 14 Jul 2016 06:16:22 -0400 Subject: Support Ubuntu 14.04 and Ubuntu 16.04 in one ISO JIRA: COMPASS-431 Change-Id: I3134b558835081e04d29a666f5d3d79486b2c7a9 Signed-off-by: chenshuai@huawei.com --- build.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index e359572b..5ec8973b 100755 --- a/build.sh +++ b/build.sh @@ -78,8 +78,9 @@ 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 $XENIAL_MITAKA_PPA $UBUNTU_ISO \ - $CENTOS_ISO $CENTOS7_JUNO_PPA $CENTOS7_KILO_PPA $CENTOS7_LIBERTY_PPA $CENTOS7_MITAKA_PPA $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG \ + for i in $CENTOS_BASE $COMPASS_CORE $COMPASS_WEB $COMPASS_INSTALL $TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $TRUSTY_MITAKA_PPA \ + $XENIAL_MITAKA_PPA $UBUNTU_ISO $UBUNTU_ISO1 $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 @@ -112,6 +113,10 @@ function copy_file() cp $CACHE_DIR/`basename $UBUNTU_ISO` $new/repos/cobbler/ubuntu/iso/ -rf fi + if [[ $UBUNTU_ISO1 ]]; then + cp $CACHE_DIR/`basename $UBUNTU_ISO1` $new/repos/cobbler/ubuntu/iso/ -rf + fi + if [[ $TRUSTY_JUNO_PPA ]]; then cp $CACHE_DIR/`basename $TRUSTY_JUNO_PPA` $new/repos/cobbler/ubuntu/ppa/ -rf fi -- cgit 1.2.3-korg