From c4c763b304c37053c246fd077a5276468578fb5b Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Fri, 8 Jul 2016 06:26:57 -0400 Subject: Improvement: add xenial into make_repo.sh JIRA: COMPASS-431 Change-Id: Ic03bdd4d4c70d77912f0c1c96ccf63ee97aadf74 Signed-off-by: chenshuai@huawei.com --- build/make_repo.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'build/make_repo.sh') diff --git a/build/make_repo.sh b/build/make_repo.sh index 55ffbf1c..d784a627 100755 --- a/build/make_repo.sh +++ b/build/make_repo.sh @@ -86,7 +86,7 @@ function make_repo() exit 1 fi - if [[ ${os_ver} == trusty ]]; then + if [[ ${os_ver} == trusty || ${os_ver} == xenial ]]; then arch=Debian os_name=ubuntu fi @@ -106,7 +106,11 @@ function make_repo() docker_tag="${os_ver}/${package_tag}" if [[ -z ${tmpl} ]]; then - tmpl=${BUILD_PATH}/templates/${arch}_${package_tag}.tmpl + if [[ ${os_ver} == xenial ]]; then + tmpl=${BUILD_PATH}/templates/${arch}_${os_ver}_${package_tag}.tmpl + else + tmpl=${BUILD_PATH}/templates/${arch}_${package_tag}.tmpl + fi fi if [[ "${ansible_dir}" != "" ]]; then @@ -276,6 +280,10 @@ function make_all_repo() --default-package "openssh-server" \ --special-package "openvswitch-switch" done + + make_repo --os-ver xenial --package-tag mitaka \ + --ansible-dir $WORK_PATH/deploy/adapters/ansible \ + --default-package "openssh-server" make_repo --os-ver rhel7 --package-tag juno \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ -- cgit 1.2.3-korg