migrating mcord api-tests to use "helm install mcord" (new build system)
Change-Id: I026fd317d1af85d1a2fc86cb937f15e54317a897
diff --git a/jjb/pipeline/all-xos-api-test-helm.groovy b/jjb/pipeline/all-xos-api-test-helm.groovy
index 1aa5a42..6c0bae9 100644
--- a/jjb/pipeline/all-xos-api-test-helm.groovy
+++ b/jjb/pipeline/all-xos-api-test-helm.groovy
@@ -113,9 +113,15 @@
helm dep update xos-profiles/rcord-lite
helm install xos-profiles/rcord-lite -n rcord-lite
sleep 360
- helm status xos-core
- kubectl get pods
+
fi
+ if [[ "$GERRIT_PROJECT" =~ ^(mcord|vspgwu|venb|vspgwc|vEPC|vMME|vHSS|hss_db|epc-service|internetemulator|sdn-controller)\$ ]]; then
+ helm dep update xos-profiles/mcord
+ helm install xos-profiles/mcord -n mcord
+ sleep 360
+ fi
+ helm status xos-core
+ kubectl get pods
helm ls
popd
"""
@@ -132,7 +138,7 @@
SERVICES=\$(docker exec -i \$CORE_CONTAINER /bin/bash -c "cd /opt/xos/dynamic_services/;find -name '*.xproto'" | awk -F[//] '{print \$2}')
export testname=_service_api.robot
export library=_library.robot
- if [[ "$GERRIT_PROJECT" =~ ^(rcord|vrouter|vsg|vtn|vtr|fabric|openstack|chameleon|exampleservice|simpleexampleservice|onos-service|olt-service|kubernetes-service)\$ ]]; then
+ if ! [[ "$GERRIT_PROJECT" =~ ^(cord|platform-install|xos)\$ ]]; then
for i in \$SERVICES; do bash -c "docker exec -i \$CORE_CONTAINER /bin/bash -c 'xosgenx --target /opt/xos/lib/xos-genx/xosgenx/targets/./xosserviceapitests.xtarget /opt/xos/dynamic_services/\$i/\$i.xproto /opt/xos/core/models/core.xproto'" > $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests/\$i\$testname; done
for i in \$SERVICES; do bash -c "docker exec -i \$CORE_CONTAINER /bin/bash -c 'xosgenx --target /opt/xos/lib/xos-genx/xosgenx/targets/./xoslibrary.xtarget /opt/xos/dynamic_services/\$i/\$i.xproto /opt/xos/core/models/core.xproto'" > $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests/\$i\$library; done
fi
@@ -162,7 +168,7 @@
sed -i \"s/^\\(PASSWD = \\).*/\\1\'letmein\'/\" RestApiProperties.py
cd $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests
pybot -d Log -T -e TenantWithContainer -e Port -e ControllerImages -e ControllerNetwork -e ControllerSlice -e ControllerUser XOSCoreAPITests.robot || true
- if [[ "$GERRIT_PROJECT" =~ ^(rcord|vrouter|vsg|vtn|vtr|fabric|openstack|chameleon|exampleservice|simpleexampleservice|onos-service|olt-service|kubernetes-service)\$ ]]; then
+ if ! [[ "$GERRIT_PROJECT" =~ ^(cord|platform-install|xos)\$ ]]; then
for i in \$SERVICES; do bash -c "pybot -d Log -T -e AddressManagerServiceInstance -v TESTLIBRARY:\$i\$library \$i\$testname"; sleep 2; done || true
fi
popd
@@ -181,7 +187,7 @@
otherFiles: '',
outputFileName: 'RobotLogs/output*.xml',
outputPath: '.',
- passThreshold: 95,
+ passThreshold: 94,
reportFileName: 'RobotLogs/report*.html',
unstableThreshold: 0]);
}
@@ -196,6 +202,9 @@
if [[ "$GERRIT_PROJECT" =~ ^(rcord|vrouter|vsg|vtn|vtr|fabric|openstack|chameleon|exampleservice|simpleexampleservice|onos-service|olt-service|kubernetes-service)\$ ]]; then
helm delete --purge rcord-lite
fi
+ if [[ "$GERRIT_PROJECT" =~ ^(mcord|vspgwu|venb|vspgwc|vEPC|vMME|vHSS|hss_db|epc-service|internetemulator|sdn-controller)\$ ]]; then
+ helm delete --purge mcord
+ fi
minikube delete
'''
step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "suchitra@opennetworking.org, you@opennetworking.org, kailash@opennetworking.org", sendToIndividuals: false])
diff --git a/jjb/verify/epc-service.yaml b/jjb/verify/epc-service.yaml
index 09bb168..40c7907 100644
--- a/jjb/verify/epc-service.yaml
+++ b/jjb/verify/epc-service.yaml
@@ -17,4 +17,4 @@
dependency-jobs: 'verify_epc-service_licensed'
- 'api-test':
dependency-jobs: 'verify_epc-service_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/hss_db.yaml b/jjb/verify/hss_db.yaml
index 4eef2c6..00dfc1f 100644
--- a/jjb/verify/hss_db.yaml
+++ b/jjb/verify/hss_db.yaml
@@ -17,4 +17,4 @@
dependency-jobs: 'verify_hss_db_licensed'
- 'api-test':
dependency-jobs: 'verify_hss_db_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/internetemulator.yaml b/jjb/verify/internetemulator.yaml
index 6849445..a8f1483 100644
--- a/jjb/verify/internetemulator.yaml
+++ b/jjb/verify/internetemulator.yaml
@@ -17,4 +17,4 @@
dependency-jobs: 'verify_internetemulator_licensed'
- 'api-test':
dependency-jobs: 'verify_internetemulator_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/mcord.yaml b/jjb/verify/mcord.yaml
index bc0e3fc..d5f0ece 100644
--- a/jjb/verify/mcord.yaml
+++ b/jjb/verify/mcord.yaml
@@ -17,3 +17,6 @@
dependency-jobs: 'verify_mcord_licensed'
- 'verify-sonarqube':
dependency-jobs: 'verify_mcord_ansible-lint'
+ - 'api-test':
+ dependency-jobs: 'verify_mcord_sonarqube'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/sdn-controller.yaml b/jjb/verify/sdn-controller.yaml
index f3cbe7a..805124b 100644
--- a/jjb/verify/sdn-controller.yaml
+++ b/jjb/verify/sdn-controller.yaml
@@ -17,4 +17,4 @@
dependency-jobs: 'verify_sdn-controller_licensed'
- 'api-test':
dependency-jobs: 'verify_sdn-controller_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vEE.yaml b/jjb/verify/vEE.yaml
index da44582..466172c 100644
--- a/jjb/verify/vEE.yaml
+++ b/jjb/verify/vEE.yaml
@@ -17,4 +17,4 @@
dependency-jobs: 'verify_vEE_licensed'
- 'api-test':
dependency-jobs: 'verify_vEE_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vEG.yaml b/jjb/verify/vEG.yaml
index b58db28..720c740 100644
--- a/jjb/verify/vEG.yaml
+++ b/jjb/verify/vEG.yaml
@@ -19,4 +19,4 @@
dependency-jobs: 'verify_vEG_sonarqube'
- 'api-test':
dependency-jobs: 'verify_vEG_unit-test'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vEPC.yaml b/jjb/verify/vEPC.yaml
index 034deb5..4ad4366 100644
--- a/jjb/verify/vEPC.yaml
+++ b/jjb/verify/vEPC.yaml
@@ -17,4 +17,4 @@
dependency-jobs: 'verify_vEPC_licensed'
- 'api-test':
dependency-jobs: 'verify_vEPC_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vHSS.yaml b/jjb/verify/vHSS.yaml
index f28daba..e1f1317 100644
--- a/jjb/verify/vHSS.yaml
+++ b/jjb/verify/vHSS.yaml
@@ -17,4 +17,4 @@
dependency-jobs: 'verify_vHSS_licensed'
- 'api-test':
dependency-jobs: 'verify_vHSS_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vMME.yaml b/jjb/verify/vMME.yaml
index e7ec052..7099e51 100644
--- a/jjb/verify/vMME.yaml
+++ b/jjb/verify/vMME.yaml
@@ -17,4 +17,4 @@
dependency-jobs: 'verify_vMME_licensed'
- 'api-test':
dependency-jobs: 'verify_vMME_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/venb.yaml b/jjb/verify/venb.yaml
index c2c5a93..b928b67 100644
--- a/jjb/verify/venb.yaml
+++ b/jjb/verify/venb.yaml
@@ -17,4 +17,4 @@
dependency-jobs: 'verify_venb_licensed'
- 'api-test':
dependency-jobs: 'verify_venb_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vspgwc.yaml b/jjb/verify/vspgwc.yaml
index 9ec1606..3e2431f 100644
--- a/jjb/verify/vspgwc.yaml
+++ b/jjb/verify/vspgwc.yaml
@@ -17,4 +17,4 @@
dependency-jobs: 'verify_vspgwc_licensed'
- 'api-test':
dependency-jobs: 'verify_vspgwc_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vspgwu.yaml b/jjb/verify/vspgwu.yaml
index 6c69831..77d55b5 100644
--- a/jjb/verify/vspgwu.yaml
+++ b/jjb/verify/vspgwu.yaml
@@ -17,4 +17,4 @@
dependency-jobs: 'verify_vspgwu_licensed'
- 'api-test':
dependency-jobs: 'verify_vspgwu_sonarqube'
- pipeline_script: 'all-xos-api-test.groovy'
+ pipeline_script: 'all-xos-api-test-helm.groovy'