commit d24b76adca71f4df0f5a41246090007aab74d51b
author Zack Williams <zdw@opennetworking.org> Mon Jun 01 20:35:21 2020 +0000
committer Gerrit Code Review <gerrit@opencord.org> Mon Jun 01 20:35:21 2020 +0000
tree 139e5f075f8e77344970f26193d3a6f753fd7f0c
parent cb726434947bd9b0a1a4c00dcb44f81fba60da2c
parent b8bfa935b7dd3780c25e3e157bf8d0f2fedad755

Merge "Use c3po master branch in post merge jobs"

jjb/pipeline/voltha-scale-test.groovy

diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 89b2126..853b7fc 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -395,7 +395,7 @@
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 meters > $WORKSPACE/logs/onos-meters-list.txt
         fi
 
-        if [ ${provisionSubscribers} = true ]
+        if [ ${provisionSubscribers} = true ]; then
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 volt-programmed-subscribers > $WORKSPACE/logs/onos-programmed-subscribers.txt
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 volt-programmed-meters > $WORKSPACE/logs/onos-programmed-meters.txt
         fi

jjb/voltha-scale.yaml

diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index eabc041..3037117 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -173,39 +173,39 @@
           onosImg: andreacampanella/voltha-onos:voltha-multi-part
 
       # jobs for 1024 ONUs with a 8 openonu-adapters and clustered ONOS (2 OLTs)
-      # - 'voltha-scale-measurements':
-      #     disabled: true
-      #     name: 'voltha-scale-measurements-2-16-32-activation'
-      #     build-node: 'onf-pod1-head-node'
-      #     time-trigger: "H H/4 * * *"
-      #     olts: 2
-      #     pons: 16
-      #     onus: 32
-      #     withFlows: false
-      #     provisionSubscribers: false
-      #     withEapol: false
-      #     withDhcp: false
-      #     withIgmp: false
-      #     openonuAdapterReplicas: 8
-      #     onosReplicas: 3
-      #     atomixReplicas: 3
-      # - 'voltha-scale-measurements':
-      #     disabled: true
-      #     name: 'voltha-scale-measurements-2-16-32-att-flows'
-      #     build-node: 'onf-pod1-head-node'
-      #     time-trigger: "H H/4 * * *"
-      #     olts: 2
-      #     pons: 16
-      #     onus: 32
-      #     withFlows: true
-      #     provisionSubscribers: false
-      #     withEapol: true
-      #     withDhcp: true
-      #     withIgmp: false
-      #     openonuAdapterReplicas: 8
-      #     onosReplicas: 3
-      #     atomixReplicas: 3
-      #     extraHelmFlags: '--set auth=false '
+      - 'voltha-scale-measurements':
+          disabled: true
+          name: 'voltha-scale-measurements-2-16-32-activation'
+          build-node: 'onf-pod1-head-node'
+          time-trigger: "H H/4 * * *"
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: false
+          provisionSubscribers: false
+          withEapol: false
+          withDhcp: false
+          withIgmp: false
+          openonuAdapterReplicas: 8
+          onosReplicas: 3
+          atomixReplicas: 3
+      - 'voltha-scale-measurements':
+          disabled: true
+          name: 'voltha-scale-measurements-2-16-32-att-flows'
+          build-node: 'onf-pod1-head-node'
+          time-trigger: "H H/4 * * *"
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: false
+          withEapol: true
+          withDhcp: true
+          withIgmp: false
+          openonuAdapterReplicas: 8
+          onosReplicas: 3
+          atomixReplicas: 3
+          extraHelmFlags: '--set auth=false '
       # - 'voltha-scale-measurements':
       #     disabled: true
       #     name: 'voltha-scale-measurements-2-16-32-att-subscribers'