Merge "Move to new OLT debian package - openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb"
diff --git a/jjb/pipeline/voltha/master/software-upgrades.groovy b/jjb/pipeline/voltha/master/software-upgrades.groovy
index 8cb4a8a..719a24f 100644
--- a/jjb/pipeline/voltha/master/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/master/software-upgrades.groovy
@@ -40,7 +40,7 @@
String[] split;
onosImg = onosImg.trim()
split = onosImg.split(':')
- extraHelmFlags = extraHelmFlags + "--set onos-classic.images.onos.repository=" + split[0] +",onos-classic.images.onos.tag=" + split[1] + " "
+ extraHelmFlags = extraHelmFlags + "--set onos-classic.image.repository=" + split[0] +",onos-classic.image.tag=" + split[1] + " "
}
def localCharts = false
// Currently only testing with ATT workflow
@@ -57,6 +57,9 @@
_TAG=onos-port-forward kubectl port-forward --address 0.0.0.0 -n infra svc/voltha-infra-onos-classic-hs 8181:8181&
_TAG=voltha-port-forward kubectl port-forward --address 0.0.0.0 -n voltha svc/voltha-voltha-api 55555:55555&
"""
+ sh """
+ sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 log:set DEBUG org.opencord
+ """
}
stage('Test - '+ name) {
sh """
@@ -133,16 +136,18 @@
def get_pods_info(dest) {
// collect pod details, this is here in case of failure
sh """
+ rm -rf ${dest} || true
mkdir -p ${dest}
kubectl get pods --all-namespaces -o wide > ${dest}/pods.txt || true
kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\n'}" | sort | uniq | tee ${dest}/pod-images.txt || true
kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.imageID}{'\\n'}" | sort | uniq | tee ${dest}/pod-imagesId.txt || true
- kubectl describe pods --all-namespaces -l app.kubernetes.io/part-of=voltha > ${dest}/pods-describe.txt
+ kubectl describe pods --all-namespaces -l app.kubernetes.io/part-of=voltha > ${dest}/voltha-pods-describe.txt
+ kubectl describe pods -n infra -l app=onos-classic > ${dest}/onos-pods-describe.txt
helm ls --all-namespaces > ${dest}/helm-charts.txt
"""
sh '''
# copy the ONOS logs directly from the container to avoid the color codes
- printf '%s\n' $(kubectl get pods -l app=onos-classic -o=jsonpath="{.items[*]['metadata.name']}") | xargs --no-run-if-empty -I# bash -c "kubectl cp #:${karafHome}/data/log/karaf.log ${dest}/#.log" || true
+ printf '%s\\n' $(kubectl get pods -n infra -l app=onos-classic -o=jsonpath="{.items[*]['metadata.name']}") | xargs --no-run-if-empty -I# bash -c 'kubectl -n infra cp #:apache-karaf-4.2.9/data/log/karaf.log ''' + dest + '''/#.log' || true
'''
}
pipeline {
@@ -156,6 +161,7 @@
environment {
PATH="$PATH:$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
KUBECONFIG="$HOME/.kube/kind-config-voltha-minimal"
+ SSHPASS="karaf"
}
stages{
stage('Download Code') {
diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index 74d0af6..2360f40 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -695,6 +695,7 @@
sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 masters > $LOG_FOLDER/onos-masters.txt
sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 roles > $LOG_FOLDER/onos-roles.txt
sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg get > $LOG_FOLDER/onos-cfg.txt
+ sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 netcfg > $LOG_FOLDER/onos-netcfg.txt
sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 ports > $LOG_FOLDER/onos-ports-list.txt
sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 hosts > $LOG_FOLDER/onos-hosts-list.txt
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 4d77d09..7ea34f6 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -9,26 +9,27 @@
- 'software-upgrades-test':
name: 'periodic-software-upgrade-test-bbsim'
pipeline-script: 'voltha/master/software-upgrades.groovy'
+ onos-image: 'andreacampanella/voltha-onos:olt-group-pkt-req-mcast-fix'
build-node: 'qct-pod4-node2'
code-branch: 'master'
aaa-version: '2.3.0.SNAPSHOT'
aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.3.0-SNAPSHOT/aaa-app-2.3.0-20210311.091026-2.oar'
olt-version: '4.4.0.SNAPSHOT'
- olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.4.0-SNAPSHOT/olt-app-4.4.0-20210311.091257-5.oar'
+ olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.4.0-SNAPSHOT/olt-app-4.4.0-20210319.122447-8.oar'
dhcpl2relay-version: '2.4.0.SNAPSHOT'
dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.4.0-SNAPSHOT/dhcpl2relay-app-2.4.0-20210311.091154-2.oar'
igmpproxy-version: '2.2.0.SNAPSHOT'
- igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.2.0-SNAPSHOT/onos-app-igmpproxy-app-2.2.0-20210311.091116-8.oar'
+ igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.2.0-SNAPSHOT/onos-app-igmpproxy-app-2.2.0-20210312.105254-9.oar'
sadis-version: '5.3.0.SNAPSHOT'
sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.3.0-SNAPSHOT/sadis-app-5.3.0-20210311.085841-3.oar'
mcast-version: '2.2.0.SNAPSHOT'
- mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.2.0-SNAPSHOT/mcast-app-2.2.0-20210311.091251-4.oar'
+ mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.2.0-SNAPSHOT/mcast-app-2.2.0-20210316.083454-5.oar'
kafka-version: '2.6.0.SNAPSHOT'
kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.6.0-SNAPSHOT/kafka-2.6.0-20210311.093145-2.oar'
- adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.1.3'
+ adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.1.6'
adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.6'
rw-core-image: 'voltha/voltha-rw-core:2.6.3'
- ofagent-image: 'voltha/voltha-ofagent-go:1.5.1'
+ ofagent-image: 'voltha/voltha-ofagent-go:1.5.2'
time-trigger: "H H/23 * * *"
- job-template:
@@ -87,7 +88,7 @@
- string:
name: onosImg
- default: ''
+ default: '{onos-image}'
description: 'ONOS Image to use'
- string:
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 02d25b2..5ad2686 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -96,7 +96,7 @@
time-trigger: "H 0 29 2 *"
withMonitoring: true
olts: 1
- pons: 1
+ pons: 16
onus: 32
withFlows: true
provisionSubscribers: true
@@ -105,8 +105,6 @@
withIgmp: false
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
withPcap: false
- openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:id-validation
- bbsimImg: matteoscandolo/bbsim:id-check
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-master-experimental-multi-stack'
@@ -192,8 +190,7 @@
withDhcp: true
withIgmp: false
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
- onosImg: andreacampanella/voltha-onos:olt-mac-integration
-# bbsimImg: matteoscandolo/bbsim:id-check
+# onosImg: andreacampanella/voltha-onos:olt-mac-integration
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers'
@@ -210,8 +207,7 @@
withDhcp: false
withIgmp: false
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
- onosImg: andreacampanella/voltha-onos:olt-mac-integration
-# bbsimImg: matteoscandolo/bbsim:id-check
+# onosImg: andreacampanella/voltha-onos:olt-mac-integration
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers'
@@ -230,8 +226,7 @@
onosReplicas: 3
atomixReplicas: 3
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
- onosImg: andreacampanella/voltha-onos:olt-mac-integration
-# bbsimImg: matteoscandolo/bbsim:id-check
+ onosImg: andreacampanella/voltha-onos:olt-group-pkt-req-mcast-fix
# multi-stack jobs
- 'voltha-scale-measurements':
@@ -252,7 +247,7 @@
withEapol: true
withDhcp: true
withIgmp: false
- onosImg: andreacampanella/voltha-onos:olt-mac-integration
+ #onosImg: andreacampanella/voltha-onos:olt-mac-integration
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-master-10-stacks-2-16-32-dt-subscribers'
@@ -272,7 +267,7 @@
withEapol: false
withDhcp: false
withIgmp: false
- onosImg: andreacampanella/voltha-onos:olt-mac-integration
+ #onosImg: andreacampanella/voltha-onos:olt-mac-integration
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-master-10-stacks-2-16-32-tt-subscribers'
@@ -292,7 +287,7 @@
withEapol: false
withDhcp: true
withIgmp: true
- onosImg: andreacampanella/voltha-onos:olt-mac-integration
+ onosImg: andreacampanella/voltha-onos:olt-group-pkt-req-mcast-fix
# voltha-2.6 Jobs
- 'voltha-scale-measurements':
diff --git a/vars/helmTeardown.groovy b/vars/helmTeardown.groovy
index 3dff0ab..71fd263 100644
--- a/vars/helmTeardown.groovy
+++ b/vars/helmTeardown.groovy
@@ -7,7 +7,7 @@
for(int i = 0;i<namespaces.size();i++) {
def n = namespaces[i]
sh """
- for hchart in \$(helm list -n ${n} -q | grep -E -v '${exc}');
+ for hchart in \$(helm list --all -n ${n} -q | grep -E -v '${exc}');
do
echo "Purging chart: \${hchart}"
helm delete -n ${n} "\${hchart}"