Using karaf 4.2.14 for master
Change-Id: I5e9c4b6638a6e40e7d13223aad70deeb2ded8176
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index a2875d9..1bf6631 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -200,7 +200,7 @@
# karaf-home
# Use to grab the logs or onos-diagnostics
- karaf-home: 'apache-karaf-4.2.9'
+ karaf-home: 'apache-karaf-4.2.14'
# maven version
# Have to setup JAVA_HOME correctly if we upgrade to mvn36
diff --git a/jjb/pipeline/voltha/master/software-upgrades.groovy b/jjb/pipeline/voltha/master/software-upgrades.groovy
index 387cbda..69c6f2c 100755
--- a/jjb/pipeline/voltha/master/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/master/software-upgrades.groovy
@@ -183,7 +183,7 @@
"""
sh '''
# copy the ONOS logs directly from the container to avoid the color codes
- 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
+ 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.14/data/log/karaf.log ''' + dest + '''/#.log' || true
'''
}
pipeline {
diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index ab9514b..d293cb2 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -698,13 +698,13 @@
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 $LOG_FOLDER/#.log" || true
# get ONOS cfg from the 3 nodes
- # kubectl exec -t voltha-infra-onos-classic-0 -- sh /root/onos/apache-karaf-4.2.9/bin/client cfg get > ~/voltha-infra-onos-classic-0-cfg.txt || true
- # kubectl exec -t voltha-infra-onos-classic-1 -- sh /root/onos/apache-karaf-4.2.9/bin/client cfg get > ~/voltha-infra-onos-classic-1-cfg.txt || true
- # kubectl exec -t voltha-infra-onos-classic-2 -- sh /root/onos/apache-karaf-4.2.9/bin/client cfg get > ~/voltha-infra-onos-classic-2-cfg.txt || true
+ # kubectl exec -t voltha-infra-onos-classic-0 -- sh /root/onos/${karafHome}/bin/client cfg get > ~/voltha-infra-onos-classic-0-cfg.txt || true
+ # kubectl exec -t voltha-infra-onos-classic-1 -- sh /root/onos/${karafHome}/bin/client cfg get > ~/voltha-infra-onos-classic-1-cfg.txt || true
+ # kubectl exec -t voltha-infra-onos-classic-2 -- sh /root/onos/${karafHome}/bin/client cfg get > ~/voltha-infra-onos-classic-2-cfg.txt || true
- # kubectl exec -t voltha-infra-onos-classic-0 -- sh /root/onos/apache-karaf-4.2.9/bin/client obj-next-ids > ~/voltha-infra-onos-classic-0-next-objs.txt || true
- # kubectl exec -t voltha-infra-onos-classic-1 -- sh /root/onos/apache-karaf-4.2.9/bin/client obj-next-ids > ~/voltha-infra-onos-classic-1-next-objs.txt || true
- # kubectl exec -t voltha-infra-onos-classic-2 -- sh /root/onos/apache-karaf-4.2.9/bin/client obj-next-ids > ~/voltha-infra-onos-classic-2-next-objs.txt || true
+ # kubectl exec -t voltha-infra-onos-classic-0 -- sh /root/onos/${karafHome}/bin/client obj-next-ids > ~/voltha-infra-onos-classic-0-next-objs.txt || true
+ # kubectl exec -t voltha-infra-onos-classic-1 -- sh /root/onos/${karafHome}/bin/client obj-next-ids > ~/voltha-infra-onos-classic-1-next-objs.txt || true
+ # kubectl exec -t voltha-infra-onos-classic-2 -- sh /root/onos/${karafHome}/bin/client obj-next-ids > ~/voltha-infra-onos-classic-2-next-objs.txt || true
# get radius logs out of the container
kubectl cp $(kubectl get pods -l app=radius --no-headers | awk '{print $1}'):/var/log/freeradius/radius.log $LOG_FOLDER/radius.log || true
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index c5d2a85..a0052a5 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -206,6 +206,7 @@
withDhcp: true
withIgmp: false
release: voltha-2.8
+ karaf-home: 'apache-karaf-4.2.9'
bbsimImg: ''
rwCoreImg: ''
ofAgentImg: ''
@@ -231,6 +232,7 @@
withDhcp: false
withIgmp: false
release: voltha-2.8
+ karaf-home: 'apache-karaf-4.2.9'
bbsimImg: ''
rwCoreImg: ''
ofAgentImg: ''
@@ -256,6 +258,7 @@
withDhcp: true
withIgmp: true
release: voltha-2.8
+ karaf-home: 'apache-karaf-4.2.9'
bbsimImg: ''
rwCoreImg: ''
ofAgentImg: ''
@@ -285,6 +288,7 @@
withFlows: true
provisionSubscribers: true
release: voltha-2.8
+ karaf-home: 'apache-karaf-4.2.9'
workflow: att
withEapol: true
withDhcp: true
@@ -317,6 +321,7 @@
withFlows: true
provisionSubscribers: true
release: voltha-2.8
+ karaf-home: 'apache-karaf-4.2.9'
workflow: dt
withEapol: false
withDhcp: false
@@ -349,6 +354,7 @@
withFlows: true
provisionSubscribers: true
release: voltha-2.8
+ karaf-home: 'apache-karaf-4.2.9'
workflow: tt
withEapol: false
withDhcp: true
@@ -696,7 +702,7 @@
volthaHelmChartsChange: ''
kindVolthaChange: ''
inMemoryEtcdStorage: true
- karafHome: 'apache-karaf-4.2.9'
+ karafHome: 'apache-karaf-4.2.14'
logLevel: 'INFO'
dockerRegistry: 10.90.0.101:30500
trigger-comment: vv7CBoQQYYonvaN8xcru
@@ -800,7 +806,7 @@
volthaHelmChartsChange: ''
kindVolthaChange: ''
inMemoryEtcdStorage: true
- karafHome: 'apache-karaf-4.2.9'
+ karafHome: 'apache-karaf-4.2.14'
logLevel: 'INFO'
dockerRegistry: 10.90.0.69:30500