[VOL-4237] Removing log-collector.sh script from physical pipeline (logs are already collected by a Robot keyword)
Enabling voltha-scale-multi-stack jobs for voltha-2.8
Change-Id: I4b103de08e74f47a6d520302573f61afb0f20a95
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 1155584..b3ccb65 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -256,8 +256,8 @@
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-att-subscribers'
build-node: 'voltha-scale-2'
- 'disable-job': true
- pipeline-script: 'voltha-scale-multi-stack.groovy'
+ 'disable-job': false
+ pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
time-trigger: "H H/4 * * *"
withMonitoring: false
logLevel: WARN
@@ -283,8 +283,8 @@
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-dt-subscribers'
build-node: 'voltha-scale-2'
- pipeline-script: 'voltha-scale-multi-stack.groovy'
- 'disable-job': true
+ pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
+ 'disable-job': false
time-trigger: "H H/4 * * *"
withMonitoring: false
logLevel: WARN
@@ -310,8 +310,8 @@
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-2.8-10-stacks-2-16-32-tt-subscribers'
build-node: 'voltha-scale-2'
- pipeline-script: 'voltha-scale-multi-stack.groovy'
- 'disable-job': true
+ pipeline-script: 'voltha/voltha-2.8/voltha-scale-multi-stack.groovy'
+ 'disable-job': false
time-trigger: "H H/4 * * *"
withMonitoring: false
logLevel: WARN
@@ -385,21 +385,6 @@
build-node: 'voltha-scale'
extraHelmFlags: '--set defaults.rw_core.timeout=30s '
- # development matrix
- - 'voltha-scale-matrix':
- name: 'voltha-scale-matrix-voltha-master-dev'
- build-node: 'voltha-scale'
-
- # development matrix
- - 'voltha-scale-matrix':
- name: 'voltha-scale-matrix-voltha-master'
- build-node: 'voltha-scale-1'
- onosReplicas: 3
- atomixReplicas: 3
- kafkaReplicas: 3
- etcdReplicas: 3
- topologies: 1-16-16, 1-16-32, 2-16-32
- time-trigger: H 0 * * *
# list of parameters for the VOLTHA Jobs,
# used as anchor so that can be shared across multiple jobs
@@ -815,98 +800,3 @@
branches:
- branch-compare-type: REG_EXP
branch-pattern: '{all-branches-regexp}'
-- job-template:
- id: 'voltha-scale-matrix'
- name: '{name}'
- pipeline-script: 'voltha-scale-matrix.groovy'
-
- description: |
- <!-- Managed by Jenkins Job Builder -->
- Created by {id} job-template from ci-management/jjb/voltha-scale.yaml <br /><br />
- Using pipeline {pipeline-script} <br/><br/>
- Scale measurements for VOLTHA 2.x
-
- properties:
- - cord-infra-properties:
- build-days-to-keep: '{big-build-days-to-keep}'
- artifact-num-to-keep: '{big-artifact-num-to-keep}'
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
- # default values
- time-trigger: 0 0 29 2 *
- release: master
- build-node: 'voltha-scale'
- volthaSystemTestsChange: ''
- volthaHelmChartsChange: ''
- kindVolthaChange: ''
- onosReplicas: 1
- atomixReplicas: 0
- kafkaReplicas: 1
- etcdReplicas: 1
- openonuAdapterReplicas: 1
- topologies: 1-1-1, 1-2-2, 2-2-2
-
- project-type: pipeline
- concurrent: false
-
- dsl: !include-raw-escape: pipeline/{pipeline-script}
-
- parameters:
- - string:
- name: release
- default: '{release}'
- description: 'Version of the code to test (matches a branch in kind-voltha and voltha-system-tests repos)'
-
- - string:
- name: buildNode
- default: '{build-node}'
- description: 'Name of the Jenkins node to run the job on'
-
- - string:
- name: volthaSystemTestsChange
- default: '{volthaSystemTestsChange}'
- description: 'Download a change for gerrit in the voltha-system-tests repo, example value: "refs/changes/79/18779/13"'
-
- - string:
- name: volthaHelmChartsChange
- default: '{volthaHelmChartsChange}'
- description: 'Download a change for gerrit in the voltha-helm-charts repo, example value: "refs/changes/32/19132/1"'
-
- - string:
- name: onosReplicas
- default: '{onosReplicas}'
- description: 'How many ONOSes instances to run'
-
- - string:
- name: atomixReplicas
- default: '{atomixReplicas}'
- description: 'How many Atomix instances to run'
-
- - string:
- name: kafkaReplicas
- default: '{kafkaReplicas}'
- description: 'How many Kafka instances to run'
-
- - string:
- name: etcdReplicas
- default: '{etcdReplicas}'
- description: 'How many ETCD instances to run'
-
- - string:
- name: openonuAdapterReplicas
- default: '{openonuAdapterReplicas}'
- description: 'How many OpenONU adapter instances to run'
-
- - string:
- name: topologies
- default: '{topologies}'
- description: 'Topologies configuration, comma separate list of "olt-pon-onu" eg: "1-16-16, 1-16-32"'
-
- triggers:
- - timed: |
- TZ=America/Los_Angeles
- {time-trigger}