diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-22 16:11:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-22 16:11:09 +0000 |
| commit | 17056424009a8c60d3dacef9e184c7b17160a44e (patch) | |
| tree | 5fbf4568cf1a4458e1af129809dccbbb782782ab | |
| parent | e7683a82ee118c2a584fb441a7a422dfca826e28 (diff) | |
| parent | 629f39b6928c3cb36d25dc07347de47d601e847e (diff) | |
Merge "submodule: Kill yardstick"
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch | 6 | ||||
| m--------- | upstream/yardstick | 0 |
3 files changed, 1 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 5b1bd073..1fffefb1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,10 +34,6 @@ path = upstream/vswitchperf url = https://gerrit.opnfv.org/gerrit/vswitchperf.git branch = master -[submodule "yardstick"] - path = upstream/yardstick - url = https://gerrit.opnfv.org/gerrit/yardstick.git - branch = master [submodule "fuel-astute"] path = upstream/fuel-astute url = https://github.com/openstack/fuel-astute.git diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch index 513d9fc7..7880fdfe 100644 --- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch +++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch @@ -51,7 +51,7 @@ new file mode 100644 index 0000000..1e772f0 --- /dev/null +++ b/build/armband.mk -@@ -0,0 +1,53 @@ +@@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2016 Enea AB and others. +# Alexandru.Avadanii@enea.com @@ -100,10 +100,6 @@ index 0000000..1e772f0 + export VSPERF_REPO := ${ARMBAND_BASE}/upstream/vswitchperf + export VSPERF_BRANCH := armband-workbench + export VSPERF_CHANGE := HEAD -+ -+ export YARDSTICK_REPO := ${ARMBAND_BASE}/upstream/yardstick -+ export YARDSTICK_BRANCH := armband-workbench -+ export YARDSTICK_CHANGE := HEAD +endif diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index b38ea4c..624f233 100644 diff --git a/upstream/yardstick b/upstream/yardstick deleted file mode 160000 -Subproject 27e254c2273e4be503053db882948b8abf53b26 |