[ONOS-7346]
Change-Id: Ibd1d7e5c95de77ad7adb970cff2be34444563300
diff --git a/jjb/OnosSystemTest/onos-test-pipeline.yaml b/jjb/OnosSystemTest/onos-test-pipeline.yaml
index 06a3426..1509eca 100644
--- a/jjb/OnosSystemTest/onos-test-pipeline.yaml
+++ b/jjb/OnosSystemTest/onos-test-pipeline.yaml
@@ -15,26 +15,27 @@
sandbox: true
- parameters:
- - lf-infra-parameters:
- project: '{project}'
- branch: '{stream}'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
-
properties:
- build-discarder:
num-to-keep: 20
-- job:
+- job-template:
name: all-pipeline-trigger
<<: *var-init-boiler-plate
<<: *job-boiler-plate
-
+ jvmPre: "${{"
+ jvmHeap: JAVA_OPTS:--Xms8G -Xmx8G
+ jvmEnd: "}}"
parameters:
+ - lf-infra-parameters:
+ project: '{project}'
+ branch: '{stream}'
+ stream: '{stream}'
+ lftools-version: '{lftools-version}'
+
- bool:
name: manual_run
default: false
@@ -67,10 +68,10 @@
- string:
name: ONOSJVMHeap
- default: "${JAVA_OPTS:--Xms8G -Xmx8G}"
+ default: "${{JAVA_OPTS:--Xms8G -Xmx8G}}"
description: 'ONOS cell JVM heap size setting.'
- - string:
+ - text:
name: Tests
default: '{FUNC}\n{HA}\n{SCPF}\n{USECASE}'
description: 'Specify the tests you want to run, if manual_run is selected.'
@@ -89,7 +90,7 @@
url: '$GIT_URL/$GERRIT_PROJECT'
credentials-id: '{jenkins-ssh-credential}'
branches:
- - '{stream}'
+ - 'master'
- project:
name: all-pipeline-trigger