summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Gu <james.gu@att.com>2020-12-16 10:30:05 -0800
committerJames Gu <james.gu@att.com>2020-12-17 10:11:34 -0800
commitc9fe5a0b0f8baabf274bc75f15a7bb2a5703b976 (patch)
treeccb49f39e8e344c460fe00753172fcaac991fa8f
parentc7596d9370fb22ec7c76bb28f6df9686cb075fef (diff)
Pull upstream patchset for Nova rbac fix
Also fixed the test.sh to use the simplevm patch deployed in /home/opnfv/functest folder. Pull upstream Nova policy change to fix Nova aggregate and server usage test cases Signed-off-by: James Gu <james.gu@att.com> Change-Id: Ibbdaafdf8636dbf2aca32f70baf5057a50764b11
-rw-r--r--site/intel-pod17/site-definition.yaml2
-rwxr-xr-xtools/test.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/site/intel-pod17/site-definition.yaml b/site/intel-pod17/site-definition.yaml
index 2925883..9bd0fc4 100644
--- a/site/intel-pod17/site-definition.yaml
+++ b/site/intel-pod17/site-definition.yaml
@@ -12,6 +12,6 @@ data:
repositories:
global:
- revision: v1.8-prime
+ revision: refs/changes/95/767395/3
url: https://opendev.org/airship/treasuremap.git
...
diff --git a/tools/test.sh b/tools/test.sh
index 7f3cf59..c67c89e 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -68,7 +68,7 @@ run_tests() {
-v ${FUNCTEST_CACHE}/tempest_conf.yaml:/usr/lib/python3.6/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \
-v ${FUNCTEST_CACHE}/tempest_blacklist.yaml:/usr/lib/python3.6/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml \
-v ${FUNCTEST_CACHE}/rally_blacklist.yaml:/usr/lib/python3.6/site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \
- -v /home/ubuntu/nc/functest/functest/core/singlevm.py:/usr/lib/python3.6/site-packages/functest/core/singlevm.py \
+ -v /home/opnfv/functest/singlevm.py:/usr/lib/python3.6/site-packages/functest/core/singlevm.py \
opnfv/functest-${1}:iruya bash
}