Merge "Build COMPARISON_BRANCH variable for checking chart versions"
diff --git a/jjb/cord-test/mcord.yaml b/jjb/cord-test/mcord.yaml
index 8de7751..304ddf1 100644
--- a/jjb/cord-test/mcord.yaml
+++ b/jjb/cord-test/mcord.yaml
@@ -15,4 +15,10 @@
config-pod: 'onf-mcord-pod1'
profile: 'mcord'
branch: 'master'
- Jenkinsfile: 'Jenkinsfile-mcord-build'
+ Jenkinsfile: 'Jenkinsfile-mcord-local-build'
+ - 'build_mcord_pod_manual':
+ testvm: 'onf-build'
+ config-pod: 'onf-mcord-pod2'
+ profile: 'mcord'
+ branch: 'master'
+ Jenkinsfile: 'Jenkinsfile-mcord-remote-build'
diff --git a/jjb/pipeline/chart-api-test-helm.groovy b/jjb/pipeline/chart-api-test-helm.groovy
index fea6a52..26242fa 100644
--- a/jjb/pipeline/chart-api-test-helm.groovy
+++ b/jjb/pipeline/chart-api-test-helm.groovy
@@ -246,78 +246,6 @@
}
}
- stage('install/test mcord') {
- steps {
- sh """
- #!/usr/bin/env bash
- set -eu -o pipefail
-
- helm_install_args='-f examples/api-test-values.yaml'
-
- pushd cord/helm-charts
-
- helm dep up xos-core
- helm install \${helm_install_args} xos-core -n xos-core
-
- helm dep update xos-profiles/base-openstack
- helm dep update xos-profiles/mcord
- helm install \${helm_install_args} xos-profiles/base-openstack -n base-openstack
- helm install \${helm_install_args} xos-profiles/mcord -n mcord
-
- # wait for services to load
- PODS_TIMEOUT=900 ./helm-repo-tools/wait_for_pods.sh
-
- echo "# Checking helm deployments"
- kubectl get pods
-
- for hchart in \$(helm list -q);
- do
- echo "## 'helm status' for chart: \${hchart} ##"
- helm status "\${hchart}"
- done
-
- CORE_POD=\$(kubectl get pods | grep "xos-core.*Running" | awk '{print \$1}')
- CORE_CONTAINER=\$(docker ps | grep k8s_xos-core_\${CORE_POD} | awk '{print \$1}')
-
- docker cp $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests/targets/xosapitests.xtarget \$CORE_CONTAINER:/opt/xos/lib/xos-genx/xosgenx/targets/xosapitests.xtarget
- docker cp $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests/targets/xosserviceapitests.xtarget \$CORE_CONTAINER:/opt/xos/lib/xos-genx/xosgenx/targets/xosserviceapitests.xtarget
- docker cp $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests/targets/xoslibrary.xtarget \$CORE_CONTAINER:/opt/xos/lib/xos-genx/xosgenx/targets/xoslibrary.xtarget
- docker exec -i \$CORE_CONTAINER /bin/bash -c "xosgenx --target /opt/xos/lib/xos-genx/xosgenx/targets/./xosapitests.xtarget /opt/xos/core/models/core.xproto" > $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests/XOSCoreAPITests.robot
-
- export testname=_service_api.robot
- export library=_library.robot
-
- SERVICES=\$(docker exec -i \$CORE_CONTAINER /bin/bash -c "cd /opt/xos/dynamic_services/;find -name '*.xproto'" | awk -F[//] '{print \$2}')
- echo \$SERVICES
-
- 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
-
- CHAM_CONTAINER=\$(docker ps | grep k8s_xos-chameleon | awk '{print \$1}')
- XOS_CHAMELEON=\$(docker exec \$CHAM_CONTAINER ip a | grep -oE "([0-9]{1,3}\\.){3}[0-9]{1,3}\\b" | grep 172)
-
- cd $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Properties/
- sed -i \"s/^\\(SERVER_IP = \\).*/\\1\'\$XOS_CHAMELEON\'/\" RestApiProperties.py
- sed -i \"s/^\\(SERVER_PORT = \\).*/\\1\'9101\'/\" RestApiProperties.py
- sed -i \"s/^\\(XOS_USER = \\).*/\\1\'admin@opencord.org\'/\" RestApiProperties.py
- sed -i \"s/^\\(XOS_PASSWD = \\).*/\\1\'letmein\'/\" RestApiProperties.py
- sed -i \"s/^\\(PASSWD = \\).*/\\1\'letmein\'/\" RestApiProperties.py
- timeout 300 bash -c "until http -a admin@opencord.org:letmein GET http://'\$XOS_CHAMELEON\':9101/xosapi/v1/core/sites |jq '.items[0].name'|grep -q mysite; do echo 'Waiting for API To be up'; sleep 10; done"
-
- cd $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests
- ## Run mcord services API Tests
- for i in \$SERVICES; do bash -c "robot -d Log -T -e ProgranServiceInstance -v TESTLIBRARY:\$i\$library \$i\$testname"; sleep 2; done || true
-
- popd
-
- helm delete --purge base-openstack
- helm delete --purge mcord
- helm delete --purge xos-core
- """
- }
- }
-
stage('install/test simpleexampleservice') {
steps {
sh """
diff --git a/jjb/pipeline/voltha-atest-provisioning.groovy b/jjb/pipeline/voltha-atest-provisioning.groovy
index 22da715..ece93fc 100755
--- a/jjb/pipeline/voltha-atest-provisioning.groovy
+++ b/jjb/pipeline/voltha-atest-provisioning.groovy
@@ -12,7 +12,7 @@
stage ('Clean up') {
steps {
sh '''
- rm -rf $WORKSPACE/
+ sudo rm -rf *
sudo rm -rf /home/cord/cord*
'''
}
@@ -51,7 +51,7 @@
}
}
- stage ('Start Provisioning Test') {
+ stage ('Start Voltha Test Suite') {
steps {
sh '''
cd $WORKSPACE/cord/incubator/voltha/tests/atests/common/