X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=tox-integration.ini;h=428d14b18f271bf85634ebdc7b13d02f541df492;hb=refs%2Ftags%2F2.1.4;hp=b562f863f2e4d1e6f2813cb332934f0178ad9739;hpb=bfa46147cce23a46a49fb53dfae8a790b0fe34e4;p=ric-plt%2Fa1.git

diff --git a/tox-integration.ini b/tox-integration.ini
index b562f86..428d14b 100644
--- a/tox-integration.ini
+++ b/tox-integration.ini
@@ -1,6 +1,6 @@
 # ==================================================================================
-#       Copyright (c) 2019 Nokia
-#       Copyright (c) 2018-2019 AT&T Intellectual Property.
+#       Copyright (c) 2019-2020 Nokia
+#       Copyright (c) 2018-2020 AT&T Intellectual Property.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -32,30 +32,41 @@ deps =
 changedir=integration_tests
 commands_pre=
     echo "WARNING: make sure you're running with latest docker builds!"
+# Fish function that builds and tags the 3 receivers. Run from integration_tests/testxappcode/
+#function a1intbuild
+#    docker build  -t a1:latest .
+#    cd integration_tests/testxappcode
+#    docker build -t testreceiver:latest . -f Dockerfile-test-receiver
+#    docker build -t delayreceiver:latest . -f Dockerfile-delay-receiver
+#    docker build -t queryreceiver:latest . -f Dockerfile-query-receiver
+#    cd ../..
+#end
     sleep 5
-    helm install --devel testreceiver -n testreceiver
-    helm install --devel a1mediator -n a1
+# helm v3 is helm install [name] [chart]
+    echo "linting"
+    helm lint a1mediator
+    helm lint testreceiver
+    helm lint dbaas-service
+    helm install --devel testreceiver testreceiver
+    helm install --devel a1 a1mediator
+    helm install --devel dbaas dbaas-service
 # wait for helm charts
     sleep 30
     ./portforward.sh
     sleep 2
 commands=
-    echo "linting"
-    helm lint a1mediator
-    helm lint testreceiver
     echo "running tavern"
 # run tavern
-    pytest --tavern-beta-new-traceback
+    pytest --tavern-beta-new-traceback test_a1.tavern.yaml
     echo "running ab"
 # run apache bench
-    ab -n 100 -c 10 -u putdata -T application/json http://localhost:10000/a1-p/policytypes/20000/policies/admission_control_policy
-#    echo "log collection"
-#    integration_tests/getlogs.sh
+    ab -n 100 -c 10 -v 4 http://localhost:10000/a1-p/healthcheck
 commands_post=
+    echo "log collection"
+    integration_tests/getlogs.sh
     echo "teardown"
     helm delete testreceiver
-    helm del --purge testreceiver
     helm delete a1
-    helm del --purge a1
+    helm delete dbaas
     pkill -9 kubectl
     sleep 10