diff options
author | Justin chi <chigang@huawei.com> | 2016-01-25 10:04:11 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-25 10:04:11 +0000 |
commit | 98640927866337bfd6637e250d4c28d3460dfcf1 (patch) | |
tree | 5bae3b60c1f3fcdac5b09bfe95e58cb55b622fe8 /build/make_repo.sh | |
parent | efa46a5b06c8c138aadbf396f6431acd7b606ed9 (diff) | |
parent | 1040118a7e3b4bb99f20a2fd594f2792629e11a2 (diff) |
Merge "integrate yang2tosca to compass"
Diffstat (limited to 'build/make_repo.sh')
-rwxr-xr-x | build/make_repo.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/build/make_repo.sh b/build/make_repo.sh index ad7ef228..550df7e3 100755 --- a/build/make_repo.sh +++ b/build/make_repo.sh @@ -137,7 +137,6 @@ function make_repo() fi sudo docker build --no-cache=true -t ${docker_tag} -f ${WORK_PATH}/work/repo/${dockerfile} ${WORK_PATH}/work/repo/ - sudo docker run -t -v ${WORK_PATH}/work/repo:/result ${docker_tag} image_id=$(sudo docker images|grep ${docker_tag}|awk '{print $3}') @@ -176,20 +175,17 @@ function make_all_repo() make_repo --os-ver trusty --package-tag juno \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ --default-package "openssh-server" \ - --special-package "openvswitch-switch keepalived" \ - --special-package-dir "$SPECIAL_DEBIAN_PACKAGE" + --special-package "openvswitch-switch" make_repo --os-ver trusty --package-tag kilo \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ --default-package "openssh-server" \ - --special-package "openvswitch-switch keepalived" \ - --special-package-dir "$SPECIAL_DEBIAN_PACKAGE" + --special-package "openvswitch-switch" make_repo --os-ver trusty --package-tag liberty \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ --default-package "openssh-server" \ - --special-package "openvswitch-switch keepalived" \ - --special-package-dir "$SPECIAL_DEBIAN_PACKAGE" + --special-package "openvswitch-switch" make_repo --os-ver rhel7 --package-tag juno \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ |