aboutsummaryrefslogtreecommitdiffstats
path: root/build.sh
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-07-14 06:16:22 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-07-14 06:42:33 -0400
commit1dde11d3b422f1c649244078c2b2ef945b0a0e2c (patch)
treed187c94efd52ebc3424eb3fc42c9aaaa36fa3281 /build.sh
parenta120380019a226fea98588256c6e5df02b3b352a (diff)
Support Ubuntu 14.04 and Ubuntu 16.04 in one ISO
JIRA: COMPASS-431 Change-Id: I3134b558835081e04d29a666f5d3d79486b2c7a9 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh9
1 files changed, 7 insertions, 2 deletions
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