xos-integration test pipeline to use 'testdir' parameter due to folder structure change
Change-Id: I54a2cb1c7c9ec9d82915f505b209393187f40586
diff --git a/jjb/pipeline/xos-integration-tests.groovy b/jjb/pipeline/xos-integration-tests.groovy
index 3e495f0..a677e74 100644
--- a/jjb/pipeline/xos-integration-tests.groovy
+++ b/jjb/pipeline/xos-integration-tests.groovy
@@ -127,7 +127,7 @@
CORD_KAFKA_IP=\$(kubectl exec cord-kafka-0 -- ip a | grep -oE "([0-9]{1,3}\\.){3}[0-9]{1,3}\\b" | grep 172)
pushd cord/test/cord-tester/src/test/cord-api/
source setup_venv.sh
- cd Tests/XosScaleValidations
+ cd Tests/${params.TestDir}
${params.TestCommand} || true
popd
@@ -142,7 +142,7 @@
# copy robot logs
if [ -d RobotLogs ]; then rm -r RobotLogs; fi; mkdir RobotLogs
- cp -r $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests/XosScaleValidations/Log/*ml ./RobotLogs
+ cp -r $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests/${params.TestDir}/Log/*ml ./RobotLogs
echo "# removing helm deployments"
kubectl get pods
helm list
diff --git a/jjb/xos-integration-tests.yaml b/jjb/xos-integration-tests.yaml
index f0096ca..7ebce2c 100644
--- a/jjb/xos-integration-tests.yaml
+++ b/jjb/xos-integration-tests.yaml
@@ -45,6 +45,11 @@
description: 'Name of the repo branch to use'
- string:
+ name: TestDir
+ default: 'xos-scale-tests'
+ description: 'Directory where tests reside'
+
+ - string:
name: TestCommand
default: 'robot -d Log -T -v xos_chameleon_url:127.0.0.1 -v xos_chameleon_port:30006 -v cord_kafka:\$CORD_KAFKA_IP -v num_olts:10 -v num_onus:1 -v num_pon_ports:10 xos-scale-att-workflow.robot'
description: 'Exact command to execute the tests including arguments'
@@ -95,6 +100,11 @@
description: 'Name of the repo branch to use'
- string:
+ name: TestDir
+ default: 'xos-migration-tests'
+ description: 'Directory where tests reside'
+
+ - string:
name: TestCommand
default: 'robot -d Log -T -v helm_chart:$WORKSPACE/cord/helm-charts/xos-services/simpleexampleservice xos-remove-service.robot xos-service-migrations.robot'
description: 'Exact command to execute the tests including arguments'