Merge "Alternating karaf versions between 2.4 and master"
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index b3eb53e..dd19425 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -437,7 +437,8 @@
done
# copy the ONOS logs directly from the container to avoid the color codes
- printf '%s\n' $(kubectl get pods -l app=onos-onos-classic -o=jsonpath="{.items[*]['metadata.name']}") | xargs -I@ bash -c "kubectl cp @:apache-karaf-4.2.9/data/log/karaf.log $LOG_FOLDER/@.log"
+ # TODO remove hardcoded karaf version
+ printf '%s\n' $(kubectl get pods -l app=onos-onos-classic -o=jsonpath="{.items[*]['metadata.name']}") | xargs -I@ bash -c "kubectl cp @:${karafHome}/data/log/karaf.log $LOG_FOLDER/@.log"
'''
// dump all the BBSim(s) ONU information
sh '''
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index a55d91f..56d9c44 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -254,6 +254,7 @@
atomixReplicas: 3
extraHelmFlags: '--set defaults.rw_core.timeout=30s'
release: voltha-2.4
+ karafHome: apache-karaf-4.2.8
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-voltha-2.4-2-16-32-dt-subscribers'
@@ -273,6 +274,7 @@
atomixReplicas: 3
extraHelmFlags: '--set defaults.rw_core.timeout=30s'
release: voltha-2.4
+ karafHome: apache-karaf-4.2.8
# development pipeline
- 'voltha-scale-measurements-dev':
@@ -515,6 +517,11 @@
default: '{inMemoryEtcdStorage}'
description: 'Whether to write ETCD keys on disk or keep them in memory (true=inMemory)'
+ - string:
+ name: karafHome
+ default: '{karaf-home}'
+ description: 'Karaf home'
+
project-type: pipeline
concurrent: false
@@ -721,6 +728,11 @@
default: ''
description: 'Download a change for gerrit in the kind-voltha repo, example value: "refs/changes/32/19132/1"'
+ - string:
+ name: karafHome
+ default: '{karaf-home}'
+ description: 'Karaf home'
+
project-type: pipeline
concurrent: false