Merge "Collecting also .txt files"
diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index 0dabbce..0d7c4a6 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -98,15 +98,22 @@
ps aux | grep port-forw | grep -v grep | awk '{print \$2}' | xargs --no-run-if-empty kill -9
"""
// collect pod details
- sh """
- kubectl get pods --all-namespaces -o wide > \$WORKSPACE/${name}/pods.txt || true
- kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\n'}" | sort | uniq | tee \$WORKSPACE/att/pod-images.txt || true
- kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.imageID}{'\\n'}" | sort | uniq | tee \$WORKSPACE/att/pod-imagesId.txt || true
- """
+ get_pods_info("$WORKSPACE/${name}")
helmTeardown(['infra', 'voltha'])
}
}
+def get_pods_info(dest) {
+ // collect pod details, this is here in case of failure
+ sh """
+ 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
+ """
+}
+
pipeline {
/* no label, executor is determined by JJB */
@@ -174,6 +181,12 @@
}
post {
+ aborted {
+ get_pods_info("$WORKSPACE/failed")
+ }
+ failure {
+ get_pods_info("$WORKSPACE/failed")
+ }
always {
sh '''
gzip $WORKSPACE/att/onos-voltha-combined.log || true
@@ -189,7 +202,7 @@
passThreshold: 100,
reportFileName: 'RobotLogs/*/report*.html',
unstableThreshold: 0]);
- archiveArtifacts artifacts: '*.log,**/*.log,**/*.gz,*.gz'
+ archiveArtifacts artifacts: '*.log,**/*.log,**/*.gz,*.gz,*.txt,**/*.txt'
}
}
}
diff --git a/jjb/pipeline/voltha/master/software-upgrades.groovy b/jjb/pipeline/voltha/master/software-upgrades.groovy
index 8a7d0ee..387cfe3 100644
--- a/jjb/pipeline/voltha/master/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/master/software-upgrades.groovy
@@ -50,16 +50,43 @@
mkdir -p \$ROBOT_LOGS_DIR
if [[ ${name} == 'onos-app-upgrade' ]]; then
export ONOS_APPS_UNDER_TEST+=''
- if [[ ${aaaVer.trim()} != '' && ${aaaOarUrl.trim()} != '' ]]; then
- ONOS_APPS_UNDER_TEST+="org.opencord.aaa,${aaaVer.trim()},${aaaOarUrl.trim()}"
+ if [ ${aaaVer.trim()} != '' ] && [ ${aaaOarUrl.trim()} != '' ]; then
+ ONOS_APPS_UNDER_TEST+="org.opencord.aaa,${aaaVer.trim()},${aaaOarUrl.trim()}*"
+ fi
+ if [ ${oltVer.trim()} != '' ] && [ ${oltOarUrl.trim()} != '' ]; then
+ ONOS_APPS_UNDER_TEST+="org.opencord.olt,${oltVer.trim()},${oltOarUrl.trim()}*"
+ fi
+ if [ ${dhcpl2relayVer.trim()} != '' ] && [ ${dhcpl2relayOarUrl.trim()} != '' ]; then
+ ONOS_APPS_UNDER_TEST+="org.opencord.dhcpl2relay,${dhcpl2relayVer.trim()},${dhcpl2relayOarUrl.trim()}*"
+ fi
+ if [ ${igmpproxyVer.trim()} != '' ] && [ ${igmpproxyOarUrl.trim()} != '' ]; then
+ ONOS_APPS_UNDER_TEST+="org.opencord.igmpproxy,${igmpproxyVer.trim()},${igmpproxyOarUrl.trim()}*"
+ fi
+ if [ ${sadisVer.trim()} != '' ] && [ ${sadisOarUrl.trim()} != '' ]; then
+ ONOS_APPS_UNDER_TEST+="org.opencord.sadis,${sadisVer.trim()},${sadisOarUrl.trim()}*"
+ fi
+ if [ ${mcastVer.trim()} != '' ] && [ ${mcastOarUrl.trim()} != '' ]; then
+ ONOS_APPS_UNDER_TEST+="org.opencord.mcast,${mcastVer.trim()},${mcastOarUrl.trim()}*"
+ fi
+ if [ ${kafkaVer.trim()} != '' ] && [ ${kafkaOarUrl.trim()} != '' ]; then
+ ONOS_APPS_UNDER_TEST+="org.opencord.kafka,${kafkaVer.trim()},${kafkaOarUrl.trim()}*"
fi
export ROBOT_MISC_ARGS="-d \$ROBOT_LOGS_DIR -v onos_apps_under_test:\$ONOS_APPS_UNDER_TEST -e PowerSwitch"
export TARGET=onos-app-upgrade-test
fi
if [[ ${name} == 'voltha-component-upgrade' ]]; then
export VOLTHA_COMPS_UNDER_TEST+=''
- if [[ ${adapterOpenOltImage.trim()} != '' ]]; then
- VOLTHA_COMPS_UNDER_TEST+="adapter-open-olt,adapter-open-olt,${adapterOpenOltImage.trim()}"
+ if [ ${adapterOpenOltImage.trim()} != '' ]; then
+ VOLTHA_COMPS_UNDER_TEST+="adapter-open-olt,adapter-open-olt,${adapterOpenOltImage.trim()}*"
+ fi
+ if [ ${adapterOpenOnuImage.trim()} != '' ]; then
+ VOLTHA_COMPS_UNDER_TEST+="adapter-open-onu,adapter-open-onu,${adapterOpenOnuImage.trim()}*"
+ fi
+ if [ ${rwCoreImage.trim()} != '' ]; then
+ VOLTHA_COMPS_UNDER_TEST+="rw-core,voltha,${rwCoreImage.trim()}*"
+ fi
+ if [ ${ofAgentImage.trim()} != '' ]; then
+ VOLTHA_COMPS_UNDER_TEST+="ofagent,ofagent,${ofAgentImage.trim()}*"
fi
export ROBOT_MISC_ARGS="-d \$ROBOT_LOGS_DIR -v voltha_comps_under_test:\$VOLTHA_COMPS_UNDER_TEST -e PowerSwitch"
export TARGET=voltha-comp-upgrade-test
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 4c3a4e1..ddf8923 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -13,7 +13,22 @@
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-20201210.223737-1.oar'
+ olt-version: ''
+ olt-oar-url: ''
+ dhcpl2relay-version: ''
+ dhcpl2relay-oar-url: ''
+ igmpproxy-version: ''
+ igmpproxy-oar-url: ''
+ sadis-version: ''
+ sadis-oar-url: ''
+ mcast-version: ''
+ mcast-oar-url: ''
+ kafka-version: ''
+ kafka-oar-url: ''
adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.1.3'
+ adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.4'
+ rw-core-image: 'voltha/voltha-rw-core:2.6.3'
+ ofagent-image: 'voltha/voltha-ofagent-go:1.5.1'
time-trigger: "H H/23 * * *"
- job-template:
@@ -85,14 +100,85 @@
default: '{aaa-oar-url}'
description: 'ONOS AAA App OAR File Url'
- # TODO: Add other ONOS Apps
+ - string:
+ name: oltVer
+ default: '{olt-version}'
+ description: 'ONOS OLT App Version to Test Upgrade'
+
+ - string:
+ name: oltOarUrl
+ default: '{olt-oar-url}'
+ description: 'ONOS OLT App OAR File Url'
+
+ - string:
+ name: dhcpl2relayVer
+ default: '{dhcpl2relay-version}'
+ description: 'ONOS DHCP L2 Relay App Version to Test Upgrade'
+
+ - string:
+ name: dhcpl2relayOarUrl
+ default: '{dhcpl2relay-oar-url}'
+ description: 'ONOS DHCP L2 Relay App OAR File Url'
+
+ - string:
+ name: igmpproxyVer
+ default: '{igmpproxy-version}'
+ description: 'ONOS Igmp Proxy App Version to Test Upgrade'
+
+ - string:
+ name: igmpproxyOarUrl
+ default: '{igmpproxy-oar-url}'
+ description: 'ONOS Igmp Proxy App OAR File Url'
+
+ - string:
+ name: sadisVer
+ default: '{sadis-version}'
+ description: 'ONOS Sadis App Version to Test Upgrade'
+
+ - string:
+ name: sadisOarUrl
+ default: '{sadis-oar-url}'
+ description: 'ONOS Sadis App OAR File Url'
+
+ - string:
+ name: mcastVer
+ default: '{mcast-version}'
+ description: 'ONOS MCast App Version to Test Upgrade'
+
+ - string:
+ name: mcastOarUrl
+ default: '{mcast-oar-url}'
+ description: 'ONOS MCast App OAR File Url'
+
+ - string:
+ name: kafkaVer
+ default: '{kafka-version}'
+ description: 'ONOS Kafka App Version to Test Upgrade'
+
+ - string:
+ name: kafkaOarUrl
+ default: '{kafka-oar-url}'
+ description: 'ONOS Kafka App OAR File Url'
- string:
name: adapterOpenOltImage
default: '{adapter-open-olt-image}'
description: 'Voltha Adapter Open OLT Component Image'
- # TODO: Add other Voltha Components
+ - string:
+ name: adapterOpenOnuImage
+ default: '{adapter-open-onu-image}'
+ description: 'Voltha Adapter Open ONU Component Image'
+
+ - string:
+ name: rwCoreImage
+ default: '{rw-core-image}'
+ description: 'Voltha RW Core Component Image'
+
+ - string:
+ name: ofAgentImage
+ default: '{ofagent-image}'
+ description: 'Voltha Ofagent Component Image'
project-type: pipeline
concurrent: true
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index c4d3317..c066f08 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -193,7 +193,7 @@
withIgmp: false
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
onosImg: andreacampanella/voltha-onos:app-update-sadis
- # bbsimImg: matteoscandolo/bbsim:id-check
+ bbsimImg: matteoscandolo/bbsim:id-check
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers'
@@ -211,7 +211,7 @@
withIgmp: false
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
onosImg: andreacampanella/voltha-onos:app-update-sadis
- # bbsimImg: matteoscandolo/bbsim:id-check
+ bbsimImg: matteoscandolo/bbsim:id-check
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers'
@@ -231,7 +231,7 @@
atomixReplicas: 3
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
onosImg: andreacampanella/voltha-onos:app-update-sadis
- # bbsimImg: matteoscandolo/bbsim:id-check
+ bbsimImg: matteoscandolo/bbsim:id-check
# multi-stack jobs
- 'voltha-scale-measurements':