From 1040118a7e3b4bb99f20a2fd594f2792629e11a2 Mon Sep 17 00:00:00 2001 From: baigk Date: Wed, 20 Jan 2016 21:57:04 +0800 Subject: integrate yang2tosca to compass JITA: COMPASS-281 Change-Id: Ia2b4a7e915edc74dfb6359d1df513d23bec2731c Signed-off-by: baigk --- build/make_repo.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'build/make_repo.sh') 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 \ -- cgit 1.2.3-korg