summaryrefslogtreecommitdiffstats
path: root/build/make_repo.sh
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-10-13 13:11:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-13 13:11:15 +0000
commitf3cea5848506d4b7822b47079c3f73415f295a14 (patch)
tree1040d318c3ac083bfb8c76bcc36de689856b2c0d /build/make_repo.sh
parent48bfb3f5a8a697a7c0085352b80f06c484676399 (diff)
parent2303beaf0b30a452a3787995e56c3f8f79b7c85f (diff)
Merge "Make the openstack-newton package"
Diffstat (limited to 'build/make_repo.sh')
-rwxr-xr-xbuild/make_repo.sh16
1 files changed, 10 insertions, 6 deletions
diff --git a/build/make_repo.sh b/build/make_repo.sh
index f186c46c..7c327c97 100755
--- a/build/make_repo.sh
+++ b/build/make_repo.sh
@@ -130,7 +130,7 @@ function make_repo()
echo "${ansible_dir}"
cp -rf ${ansible_dir}/roles/ ${WORK_PATH}/work/tmp/
if [[ ${os_ver} == xenial ]]; then
- if [[ -d ${ansible_dir}/openstack_${package_tag}/roles && "`ls ${ansible_dir}/openstack_${package_tag}`" != "" ]]; then
+ if [[ -d ${ansible_dir}/openstack_${package_tag}_${os_ver}/roles && "`ls ${ansible_dir}/openstack_${package_tag}_${os_ver}`" != "" ]]; then
cp -rf ${ansible_dir}/openstack_${package_tag}_${os_ver}/roles/* ${WORK_PATH}/work/tmp/roles/
fi
else
@@ -318,9 +318,11 @@ EOF
function make_all_repo()
{
- for env_os in trusty xanial rhel7; do
- make_repo --package-tag jhenv --jh-os $env_os
- done
+# for env_os in trusty xanial rhel7; do
+# make_repo --package-tag jhenv --jh-os $env_os
+# done
+# jhenv only support trusty
+ make_repo --package-tag jhenv --jh-os trusty
make_repo --package-tag pip
@@ -339,10 +341,12 @@ function make_all_repo()
--default-package "openssh-server" \
--special-package "openvswitch-switch"
done
-
- make_repo --os-ver xenial --package-tag mitaka \
+
+ for opv in mitaka newton; do
+ make_repo --os-ver xenial --package-tag $opv \
--ansible-dir $WORK_PATH/deploy/adapters/ansible \
--default-package "openssh-server"
+ done
make_repo --os-ver rhel7 --package-tag juno \
--ansible-dir $WORK_PATH/deploy/adapters/ansible \