Merge "[VOL-2992] Adding profiler to scale pipeline"
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index a576bc0..5d88cf8 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -142,7 +142,7 @@
steps {
sh """
mkdir -p $ROBOT_LOGS_DIR
- export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i dataplaneDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+ export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i sanityDtORdataplaneDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
make -C $WORKSPACE/voltha/voltha-system-tests voltha-dt-test || true
"""
}
diff --git a/jjb/pipeline/voltha-openonu-go-tests.groovy b/jjb/pipeline/voltha-openonu-go-tests.groovy
index 87de155..1949a5b 100644
--- a/jjb/pipeline/voltha-openonu-go-tests.groovy
+++ b/jjb/pipeline/voltha-openonu-go-tests.groovy
@@ -126,27 +126,20 @@
}
stage('Run E2E Tests') {
+ environment {
+ ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/openonu-go"
+ }
steps {
sh '''
- RUNNING=$(kubectl get pods --all-namespaces | grep open-onu | grep 1/1 | wc -l)
- if [ $RUNNING -eq 1 ]; then
- echo "Openonu adapter is correctly deployed"
- else
- echo "Openonu adapter is not running!"
- exit 1
- fi
+ mkdir -p $ROBOT_LOGS_DIR
+ export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
+ export TARGET=openonu-go-adapter-test
- ADAPTER=$(voltctl adapter list | grep brcm_openomci_onu | wc -l)
- if [ $ADAPTER -eq 1 ]; then
- echo "Openonu adapter is correctly registered with VOLTHA core"
- else
- echo "Openonu adapter is NOT registered with VOLTHA core"
- exit 1
- fi
- # TODO once we have a test for the openonu golang adapter replace the bash check
+ make -C $WORKSPACE/voltha/voltha-system-tests \$TARGET || true
'''
}
}
+
}
post {
@@ -198,6 +191,15 @@
cd $WORKSPACE/voltha/kind-voltha
WAIT_ON_DOWN=y ./voltha down
'''
+ step([$class: 'RobotPublisher',
+ disableArchiveOutput: false,
+ logFileName: 'RobotLogs/*/log*.html',
+ otherFiles: '',
+ outputFileName: 'RobotLogs/*/output*.xml',
+ outputPath: '.',
+ passThreshold: 100,
+ reportFileName: 'RobotLogs/*/report*.html',
+ unstableThreshold: 0]);
archiveArtifacts artifacts: '*.log,*.gz'
}
}
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index f118e07..90fb6a2 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -142,7 +142,7 @@
steps {
sh """
mkdir -p $ROBOT_LOGS_DIR
- export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i dataplane -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+ export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i sanityORdataplane -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
make -C $WORKSPACE/voltha/voltha-system-tests voltha-test || true
"""
}
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 6bd1ed7..b181d40 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -122,6 +122,24 @@
onosReplicas: 3
atomixReplicas: 3
+ # jobs for DT with 512 ONUs with a 8 openonu-adapters and clustered ONOS.
+ - 'voltha-scale-measurements':
+ name: 'voltha-scale-dt-measurements-1-16-32-subscribers'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/4 * * *"
+ olts: 1
+ pons: 16
+ onus: 32
+ withFlows: true
+ provisionSubscribers: true
+ workflow: dt
+ withEapol: false
+ withDhcp: false
+ withIgmp: false
+ openonuAdapterReplicas: 8
+ onosReplicas: 3
+ atomixReplicas: 3
+
# jobs for 1024 ONUs with a 8 openonu-adapters and clustered ONOS (2 OLTs)
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-2-16-32-activation'