Merge "Disable build_openolt_deb job for openolt project The debian package build job requires the BAL packages for the build process and is usually built once per release and definately not meant to be built every commit. Moreover this job isn't functional anymore and seems to be a remnant of the old openolt project."
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 79a6694..0700d0f 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -693,7 +693,6 @@
- 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
- 'disable-job': true
release: '2.5'
branch: 'voltha-2.5'
num-of-openonu: '2'
@@ -709,11 +708,10 @@
time: '8'
- # Berlin POD test job - voltha-2.4 versions: uses 1T8GEM tech profile on voltha branch
+ # Berlin POD test job - voltha-2.5 versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
- 'disable-job': true
name-extension: '_DT'
work-flow: 'DT'
release: '2.5'
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index c0dad32..fa11cda 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -688,7 +688,7 @@
- string:
name: registry
- default: 'registry.central.aetherproject.net'
+ default: 'registry.aetherproject.org/omecproject'
description: 'Docker registry that stores images built for CI testing'
- string:
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 60aa1ad..22c5d64 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -273,6 +273,14 @@
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.net.flow.impl.FlowRuleManager allowExtraneousRules true
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.net.flow.impl.FlowRuleManager importExtraneousRules true
+ kubectl exec onos-onos-classic-0 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set WARN org.opencord.sadis
+ kubectl exec onos-onos-classic-1 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set WARN org.opencord.sadis
+ kubectl exec onos-onos-classic-2 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set WARN org.opencord.sadis
+
+ kubectl exec onos-onos-classic-0 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set TRACE org.opencord.aaa
+ kubectl exec onos-onos-classic-1 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set TRACE org.opencord.aaa
+ kubectl exec onos-onos-classic-2 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set TRACE org.opencord.aaa
+
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 log:set DEBUG org.onosproject.net.flow.impl.FlowRuleManager
#Setting LOG level to ${logLevel}
@@ -293,16 +301,33 @@
cat BBSM-12345123451234512345-00000000000001-v1.json | kubectl exec -it $(kubectl get pods -l app=etcd | awk 'NR==2{print $1}') -- etcdctl put service/voltha/omci_mibs/templates/BBSM/12345123451234512345/00000000000001
fi
- # Start the tcp-dump in ofagent
if [ ${withPcap} = true ] ; then
+ # Start the tcp-dump in ofagent
export OF_AGENT=$(kubectl get pods -l app=ofagent -o name)
kubectl exec $OF_AGENT -- apk update
kubectl exec $OF_AGENT -- apk add tcpdump
kubectl exec $OF_AGENT -- mv /usr/sbin/tcpdump /usr/bin/tcpdump
_TAG=ofagent-tcpdump kubectl exec $OF_AGENT -- tcpdump -nei eth0 -w out.pcap&
+ # Start the tcp-dump in bbsim
export BBSIM=$(kubectl get pods -l app=bbsim -o name)
_TAG=bbsim-tcpdump kubectl exec $BBSIM -- tcpdump -nei nni -w out.pcap&
+
+ # Start the tcp-dump in radius
+ export RADIUS=$(kubectl get pods -l app=radius -o name)
+ kubectl exec $RADIUS -- apt-get update
+ kubectl exec $RADIUS -- apt-get install -y tcpdump
+ _TAG=radius-tcpdump kubectl exec $RADIUS -- tcpdump -w out.pcap&
+
+ # Start the tcp-dump in ONOS
+ LIMIT=$(($NUM_OF_ONOS - 1))
+ for i in $(seq 0 $LIMIT); do
+ INSTANCE="onos-onos-classic-$i"
+ kubectl exec $INSTANCE -- apt-get update
+ kubectl exec $INSTANCE -- apt-get install -y tcpdump
+ kubectl exec $INSTANCE -- mv /usr/sbin/tcpdump /usr/bin/tcpdump
+ _TAG=$INSTANCE kubectl exec $INSTANCE -- /usr/bin/tcpdump -nei eth0 port 1812 -w out.pcap&
+ done
fi
'''
}
@@ -423,12 +448,37 @@
kill -9 \$P_ID
fi
+ # stop radius tcpdump
+ P_ID="\$(ps e -ww -A | grep "_TAG=radius-tcpdump" | grep -v grep | awk '{print \$1}')"
+ if [ -n "\$P_ID" ]; then
+ kill -9 \$P_ID
+ fi
+
+ # stop onos tcpdump
+ LIMIT=$(($NUM_OF_ONOS - 1))
+ for i in $(seq 0 $LIMIT); do
+ INSTANCE="onos-onos-classic-$i"
+ P_ID="\$(ps e -ww -A | grep "_TAG=$INSTANCE" | grep -v grep | awk '{print \$1}')"
+ if [ -n "\$P_ID" ]; then
+ kill -9 \$P_ID
+ fi
+ done
+
# copy the file
export OF_AGENT=$(kubectl get pods -l app=ofagent | awk 'NR==2{print $1}') || true
kubectl cp $OF_AGENT:out.pcap $LOG_FOLDER/ofagent.pcap || true
export BBSIM=$(kubectl get pods -l app=bbsim | awk 'NR==2{print $1}') || true
kubectl cp $BBSIM:out.pcap $LOG_FOLDER/bbsim.pcap || true
+
+ export RADIUS=$(kubectl get pods -l app=radius | awk 'NR==2{print $1}') || true
+ kubectl cp $RADIUS:out.pcap $LOG_FOLDER/radius.pcap || true
+
+ LIMIT=$(($NUM_OF_ONOS - 1))
+ for i in $(seq 0 $LIMIT); do
+ INSTANCE="onos-onos-classic-$i"
+ kubectl cp $INSTANCE:out.pcap $LOG_FOLDER/$INSTANCE.pcap || true
+ done
fi
cd voltha-system-tests
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 616df4c..273ec46 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -67,9 +67,9 @@
atomixReplicas: 3
extraHelmFlags: '--set debug=true'
withPcap: true
- onosImg: matteoscandolo/voltha-onos:dhcp-aaa
+ onosImg: andreacampanella/voltha-onos:aaa-identifier-cleanup
+ openoltAdapterImg: gcgirish/voltha-openolt-adapter:flowChanPerSub
radiusChart: /home/cord/helm-charts/freeradius
- withRadius: 10.90.0.69:1812
# jobs for 512 ONUs with a 8 openonu-adapters and clustered ONOS (1 OLT)