diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-10-12 10:41:17 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2016-10-13 15:37:56 +0800 |
| commit | 2303beaf0b30a452a3787995e56c3f8f79b7c85f (patch) | |
| tree | 5386afc2ddeef9d4cb65542cb7159fdb78c5e2ab /build/make_repo.sh | |
| parent | 63d8f65494ed9e57d29ed1ecbce1caba81677499 (diff) | |
Make the openstack-newton package
JIRA: COMPASS-491
Change-Id: I27ca70b02c947e3c6a2467ad250ff81461c5de6f
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'build/make_repo.sh')
| -rwxr-xr-x | build/make_repo.sh | 16 |
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 \ |