Merge "Remove project distribution job"

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 3f7673a690985937520d8287d85d3b5cac338b5e..e44ef5e3011e27bbee75af2d11e36491b090bd31 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -34,8 +34,5 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream}'
-
     # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
     tools_system_count: 0

diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml
index acbb03867f1e9ebda87d970f8f7857974a35656c..5021d5e142c2fbe5248ab5fbf5d0e7368c853241 100644 (file)
--- a/jjb/aaa/aaa-csit-idmlite.yaml
+++ b/jjb/aaa/aaa-csit-idmlite.yaml
@@ -34,8 +34,5 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream}'
-
     # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
     tools_system_count: 0

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 3443aec621ae335c6b478794dc7d0cee15104968..c14410202a1b28852236e5c55d08250c737119ec 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -2,7 +2,6 @@
     name: aaa-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: aaa-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: aaa-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index 4170987e35dc689a69901a11ba83a583f6837a7c..e01a179e6a90d513b962693136ade6678e90ef45 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -33,8 +33,5 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'alto-distribution-{stream}'
-
     # Don't spin up mininet vms as alto-csit-setup jobs don't need them
     tools_system_count: 0

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 116b7bcbbfc25438f6f41964f6eb26e29ab0b31f..e6acbd93e4ae035c8e941e9fdac0251004f50eaa 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -2,7 +2,6 @@
     name: alto-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: alto-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: alto-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml
index 653a5aeb8bcdca5efc87920c741ad1518b0f9b1a..0e239f3a52fb9df836e7663ca268fb31beea7df6 100644 (file)
--- a/jjb/armoury/armoury-csit-basic.yaml
+++ b/jjb/armoury/armoury-csit-basic.yaml
@@ -35,8 +35,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        netconf-distribution-{stream},
-        armoury-distribution-{stream}

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 24e5f0e6fdfa3bd60fabc8a968bb52e119d4b362..e397334a5d848f13ea27ab1d34b1fc5276791b89 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -2,7 +2,6 @@
     name: armoury-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -29,7 +28,6 @@
     name: armoury-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -56,7 +54,6 @@
     name: armoury-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 18ba43f83ac23e3e2c4cc6829e01f12b48334b5a..db7b088b7d4bf0c493198bd72adacfe89d0d04a2 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -2,7 +2,6 @@
     name: atrium-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: atrium-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index c6d3a16eb7fabe7288492d4a2e3f2a7f959f5911..6d99ba591438a1395ed0c10a3dfe30d690c194f4 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -37,9 +37,6 @@
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:10 -v REPETITIONS_CHANGE_COUNT_SINGLE:3 -v CHECK_PERIOD_PREFIX_COUNT_MANY:10 -v TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY:8.0 -v REPETITIONS_CHANGE_COUNT_MANY:10 -v MULTIPLICITY_CHANGE_COUNT_MANY:600 -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0 '
 
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'
-
     # Controller configuration
     odl_system_flavor: 8 GB General Purpose v1
 
@@ -83,9 +80,6 @@
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test environment or more complex scenario is chosen
     robot-options: '-v USE_NETCONF_CONNECTOR:False -v COUNT:1000000 -v INSERT:10 -v WITHDRAW:9 -v PREFILL:10 -v UPDATE:single -v TEST_DURATION_MULTIPLIER:4'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Controller configuration
     odl_system_flavor: 8 GB General Purpose v1
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index f3a052d3da2450baed1bfbfc677861ba4bf1c197..e373adcb0dd2a48ddd7a2fec6ebea1b6076a2cd0 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -28,6 +28,3 @@
 
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 786da1ce33d0ec431780b9673a9d654d0bef1bcc..a376f3c065ee183297da03ca0294ffadfcb15020 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -35,8 +35,5 @@
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'
-
     # Controller configuration
     odl_system_flavor: '8 GB General Purpose v1'

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 2d3f05ac0cf51e908f4ee5f01663211705dd6911..a808296a5f4a9a397e9a7b3053b6f6c24e2c0279 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -38,10 +38,5 @@
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False -v PCEP_READY_VERIFY_TIMEOUT:5 -v RESTCONF_REUSE:False -v UPDATER_TIMEOUT:600'
 
-    # This performance test can take up to one hour to finish,
-    # so the job is defined to run once a day.
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'
-
     # Controller configuration
     odl_system_flavor: 8 GB General Purpose v1

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 76ef3ff617588ff5148e18c2181c86f5aa4e3cb9..0e0fd1cf070b56366d26231283d1e915f77ad22e 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -38,15 +38,3 @@
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs (upstream dependencies)
-    # Netconf is there for run-time re-configuration.
-    # AAA could also be a dependency, but probability of breakage is too low to trigger everytime.
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        controller-distribution-{stream},
-        mdsal-distribution-{stream},
-        netconf-distribution-{stream},
-        tcpmd5-distribution-{stream},
-        bgpcep-distribution-{stream}

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 3ee1607661583a8c9ec397e668b0138fa78d3af2..fcd35040a37f9082c5a722835629bb4dfca4071c 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -2,7 +2,6 @@
     name: bgpcep-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -31,7 +30,6 @@
     name: bgpcep-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -61,7 +59,6 @@
     name: bgpcep-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 9f243587ad82703fd4d43868722aa8597c9b2940..9abd5c1101ee5a0ee1903c5cbf5ec9920cfcc6f6 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -2,7 +2,6 @@
     name: bier-carbon\r
     jobs:\r
         - '{project-name}-clm-{stream}'\r
-        - '{project-name}-distribution-{stream}'\r
         - '{project-name}-distribution-check-{stream}'\r
         - '{project-name}-integration-{stream}'\r
         - '{project-name}-merge-{stream}'\r

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index d52ad4ea055eb75bd10f7618b2ca6983b85eaeee..70c1cf0f3a369b93e72ff3a46b6db55b4ee671a6 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'capwap-distribution-{stream}'

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index aa4416b5a7c0e9a1d8b5abde6f83c050403d5dcf..48d903a71baf8a617c3cd152da57b81a10f636e7 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -2,7 +2,6 @@
     name: capwap-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: capwap-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: capwap-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 3c3654c627dd84b9c9497258e3c08bf65427bb53..2e5dba5554eeb2edbb27bc4b582db1b10d019311 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -2,7 +2,6 @@
     name: cardinal-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: cardinal-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml
index 3aebba377ba1a1ca4ac91bb66e5863a576254def..8e2ac4c1854cef9c6606eb02678cf5f103a2fe4c 100644 (file)
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'centinel-distribution-{stream}'

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 42cfb5fe25b6ee03ebf79b3558028646feaae53b..d02c69ad27c422bfdf027fd42a4a48df53b2c6df 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -2,7 +2,6 @@
     name: centinel-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: centinel-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: centinel-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 3575d937c5ec8ef024ed4822e5fc6e14c98a1459..091cdc6275df05a264e48485e8f030e99e8af373 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -35,7 +35,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        controller-distribution-{stream}

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 39e247ac3ead6e5b6cde18dd049508f3a4cc780c..72371b93a000410f364c156bd0ebb2040aa24de7 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -36,12 +36,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        mdsal-distribution-{stream},
-        controller-distribution-{stream},
-        netconf-distribution-{stream},
-        integration-distribution-merge-{stream}

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
index bbd5fb22879b3fcb7994ee0d8aa24493c264a48d..90394584396fcd99355db24e75dd974eb0d59c46 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
@@ -33,9 +33,6 @@
     # Robot custom options
     robot-options: '--exclude singlenode_setup'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
     odl_system_flavor: '8 GB General Purpose v1'

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
index a4b5edcc9761efd3f032f2c5757b2209b8ed158f..1d37f3adb4ff57e54aa07c3b51eb7ec10f07c681 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
@@ -33,9 +33,6 @@
     # Robot custom options
     robot-options: '--exclude clustered_setup'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
     odl_system_flavor: 8 GB General Purpose v1

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index b982aef7ffb8b196f1897dfff4ff9bf7d044a5e2..303722338df08a7ad7c723e6f747fe818a684586 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index c0252a7af13ff80c336f1573b56aa03db462c60c..3b4596adf919f244b0f87355e4b4344df054286a 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index c3542caf9a5211c16a215dd3bda2efbc9ea1fe5b..f9debfbb76fb86fe9717229c972f345d95c0508e 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -2,7 +2,6 @@
     name: controller-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: controller-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: controller-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index f1098b7ebee22614356fc9b8103c09b5cc473052..1a583090bc0ee22c3ea725657db9fdbcea88a107 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -2,7 +2,6 @@
     name: coretutorials-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: coretutorials-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -54,7 +52,6 @@
     name: coretutorials-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index dad3d01117f339b14f49f9975542441766f06f7e..a374c9942ae58609ef8e2bd005fdb73f33965d03 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -28,6 +28,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'daexim-merge-{stream}'

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 02bf27447113ad0a51376469642e032312b5aec7..cdd2255377b9ba880ef4f7faa3a299942a3d9a28 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -2,7 +2,6 @@
     name: daexim-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml
index 7976732a1cc63fc17f6a669444e6a9379237f36c..84f25d52e1737cbdd3a661b03d2456000f996979 100644 (file)
--- a/jjb/didm/didm-csit-discovery.yaml
+++ b/jjb/didm/didm-csit-discovery.yaml
@@ -31,6 +31,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'didm-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 549e1f97b41a48fb1287d6e1864632df57260194..f5666bc3a658fcd74250ba329f774a1b9d4a40fa 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -2,7 +2,6 @@
     name: didm-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: didm-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: didm-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index a9ff17fa015796c83b94c1f28d7482f905c04db1..82cfc56b255e615eacad2b5bac7a9f9e3cf8f8dd 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -2,7 +2,6 @@
     name: discovery-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: discovery-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -54,7 +52,6 @@
     name: discovery-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 74c84ffd67c3755da722425d8709a412038239af..17578a7b5ec852dba8fee9d2f2b8a44bf81d1fe4 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -2,7 +2,6 @@
     name: dlux-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: dlux-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: dlux-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index 3dbc62af8e4bc4f5e71d528bc8875b19a029fd15..37b5e47357def3799d33ffacbf7de384fe6ebfa4 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -2,7 +2,6 @@
     name: dluxapps-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index 7aecd36f1fcdf446a2cf871f196812b203b919f2..96f3ad413eb1760c755528a7aa7654e4b954f949 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -2,7 +2,6 @@
     name: docs-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

diff --git a/jjb/eman/eman-csit-model.yaml b/jjb/eman/eman-csit-model.yaml
index 9f7d2c65a3226afcf7e88bec43ae1663810c2271..71dd2f63bd0cd082f3529f4e37c6c1c87b9acd37 100644 (file)
--- a/jjb/eman/eman-csit-model.yaml
+++ b/jjb/eman/eman-csit-model.yaml
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'eman-distribution-{stream}'

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index f81864d0e15c45baa3eece36310936e56aaa38d3..34e05b3e40920ab016b95e6691a7e798abd86017 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -2,7 +2,6 @@
     name: eman-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: eman-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 51f516ff398a65c3df906d18a6065babde64ed5e..00fe1614fbb7351e7943637ad358a8e6d8b6b20f 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -2,7 +2,6 @@
     name: faas-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: faas-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: faas-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 39487b6bf79ac1d903ae4010d2b1c8206848dc0e..c49d9a8d76ab04a512cbc279b8d7c1c235bf63ee 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -34,6 +34,3 @@
 
     # Robot custom options
     robot-options: ' '
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},genius-distribution-{stream}'

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index ef9d437ddff7f35c9800477cf785e12c695fa006..50f7f10db69987398adb483085b8958dc926d072 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -2,7 +2,6 @@
     name: genius-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: genius-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index e36c248ab12605cd0b7658f5d92c0904a8977160..d8db329866620203a2b26526f9cb4716e5725873 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -37,11 +37,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'groupbasedpolicy-distribution-{stream},
-                   neutron-distribution-{stream},
-                   ovsdb-distribution-{stream},
-                   openflowplugin-distribution-{stream},
-                   sfc-distribution-{stream},
-                   dlux-distribution-{stream}'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index c6a70f3c983fa20d027bfa968063b8fdf6cf3d61..561df443edce6a4f4fb60bbda97e7fd79114f710 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -39,12 +39,3 @@
 
     # Robot custom options
     robot-options: ''
-
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'groupbasedpolicy-distribution-{stream},
-                   neutron-distribution-{stream},
-                   ovsdb-distribution-{stream},
-                   openflowplugin-distribution-{stream},
-                   sfc-distribution-{stream},
-                   dlux-distribution-{stream}'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index 25fdba1f88f869ca1e290a07c995bdec600f701c..ac27097a943faf1f983c21d9d6c29f7315514f80 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -33,10 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'neutron-distribution-{stream},
-                   ovsdb-distribution-{stream},
-                   openflowplugin-distribution-{stream},
-                   sfc-distribution-{stream},
-                   dlux-distribution-{stream}'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index 8d2e412e4eced86b85346421dd0d4b977ac85df2..16296a93da98dd75bb402eed256cd7f8930b3434 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -26,6 +26,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'sfc-distribution-{stream},groupbasedpolicy-distribution-{stream},sxp-distribution-{stream}'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 321b06776083c1270b31bba00b09c5887414cae8..da3fd917cb5f5f98b6270c36b674269dc3c44055 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -2,7 +2,6 @@
     name: groupbasedpolicy-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: groupbasedpolicy-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: groupbasedpolicy-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 3dcf452485ee49d42dc215a84f1a93a98c7cd9b9..f16edde3d2c16be6c9ead242d6830eda2434ef9c 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -2,7 +2,6 @@
     name: vbd-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: vbd-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 47b3e9293bdcaa22390a3f551f5b7dc339e61a41..b5fce1aebfc1ddc8606804fd3701a104fc1fff48 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -2,7 +2,6 @@
     name: infrautils-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: infrautils-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index c8324bda7e04569422ca7668c786c9536d1624b3..309986336997e9c6463f40e61af2652b256f9502 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -39,10 +39,5 @@
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        controller-distribution-{stream},
-        integration-distribution-merge-{stream}
-
     # Controller configuration
     odl_system_flavor: 8 GB General Purpose v1

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index d92bfd5698b993673447719c93f119e0d89228cf..4511132b4e8b68dd2e1e930f57cc5b8a9d5280ae 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -155,26 +155,6 @@
                       - compare-type: 'ANT'
                         pattern: '{files}'
 
-# Macro: integration-csit-only
-# Operation: this macro sets a trigger on reverse job list
-# Used by: csit -only- job templates
-
-- trigger:
-    name: integration-csit-only
-    triggers:
-        - reverse:
-            jobs: '{jobs}'
-            result: 'success'
-
-# Macro: integration-csit-all
-# Operation: this macro sets a periodic trigger
-# Used by: csit -all- job teamplates
-
-- trigger:
-    name: integration-csit-all
-    triggers:
-        - timed: 'H H * * *'
-
 # Macro: integration-openstack-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
 # Used by: {project}-csit-* job templates

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index c56bf1cb29fe2d4762e70a2de9578c159fe01b84..ee63c6bca98b3e1abd347ccc292a0ca0c752d782 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -158,10 +158,6 @@
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    triggers:
-        - integration-csit-{install}:
-            jobs: '{trigger-jobs}'
-
     builders:
         - integration-infra-stack:
             stack-template: '{stack-template}'
@@ -269,9 +265,6 @@
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    triggers:
-        - timed: '{schedule}'
-
     builders:
         - integration-infra-stack:
             stack-template: '{stack-template}'
@@ -569,10 +562,6 @@
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    triggers:
-        - integration-csit-{install}:
-            jobs: '{trigger-jobs}'
-
     builders:
         - integration-infra-stack:
             stack-template: '{stack-template}'
@@ -681,10 +670,6 @@
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    triggers:
-        - integration-csit-{install}:
-            jobs: '{trigger-jobs}'
-
     builders:
         - integration-infra-stack:
             stack-template: '{stack-template}'
@@ -793,9 +778,6 @@
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    triggers:
-        - timed: '{schedule}'
-
     builders:
         - integration-infra-stack:
             stack-template: '{stack-template}'

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index 2871164e39d746a4ffca4d33762bcb7a9a005e10..59f7337648c962e9bfb810640a64991fa15a3567 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -37,6 +37,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'iotdm-distribution-{stream}'

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index a72974e9b0aab8f230d6dfdb64b0dc241542273d..a769e7a28b5e21bf52dc2e99db2bb687ac1c7d35 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -2,7 +2,6 @@
     name: iotdm-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: iotdm-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: iotdm-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index f486df6024c4226bf7a79baf400cedfebe7c566c..d0da62a6e30aabdb4e3fa1443978ad15565b1cbe 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -31,9 +31,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Max number of Hosts'
     01-plot-yaxis: 'Network Hosts'

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index ff12542b521a454a5481a04d85bb8237ae504839..e6da699f133113c91b16f0006b96ae94cf0c5aa7 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:7'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},l2switch-distribution-{stream}'

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 3b36a14522a31e7fb4b43a460fa33b8a17206828..cc14b0a818560ef7f3566384be54039dd73ba705 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:5'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},l2switch-distribution-{stream}'

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index e1decc799d7fc8922880c1052c3be8077b50c088..0daa6a4e56641df4747c4e14fd535f274074bc73 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -2,7 +2,6 @@
     name: l2switch-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: l2switch-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: l2switch-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index 8ac90cbf97d67ed2224b7370ca349a65c2d56549..214ce98afa0d0a7af121138dd385f2a22f1edd6b 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -35,6 +35,3 @@
 
     # Robot custom options
     robot-options: ' '
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},lacp-distribution-{stream}'

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 423a2923bdb6c25f495ec203c5315dcb69c6de25..2e031d7f1d2f8d4474df7d764029871264a1b06d 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -2,7 +2,6 @@
     name: lacp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: lacp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: lacp-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index dbdb4e09cea978a209a5ba1249662e93a5ed44fe..b2ba78e89c3a0cf7c469fdc411e1b7c4ba1b1d04 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -34,6 +34,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},neutron-distribution-{stream},lispflowmapping-distribution-{stream}'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index 5efc332b63464be45a1c7e5e88016afac7df87cc..3c162cc5d292150973c5faed7c8d5a1d0e20ef8d 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -31,9 +31,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream},lispflowmapping-distribution-{stream}'
-
     # Plot Info
     01-plot-title: 'Southbound Map-Reply Rate'
     01-plot-yaxis: 'req/sec'

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index db8ab0a705d2d4aaff5d11fdc54a31905c3e0157..21cfe76474471b3080b28032f3047ed7067c7908 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -2,7 +2,6 @@
     name: lispflowmapping-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -31,7 +30,6 @@
     name: lispflowmapping-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -60,7 +58,6 @@
     name: lispflowmapping-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index 61f1d14ec32acf862273808fab0f83e0f0082824..88bb7a885446016ada26ddf0a01a3b1b2f697f6b 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -38,6 +38,3 @@
 
     # Additional patterns to archive
     archive-artifacts: '*.xml'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 6e70808a706d491502cc186e484ea3b8a1033fa3..17c2685221ea499c205732200ce7fb335c379ea0 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,7 +2,6 @@
     name: mdsal-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: mdsal-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: mdsal-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
index f2a3357df939c9a56caee14b734d4c191e9d7065..f625154cc9212e7619b4c918bf7a8e64562e6210 100644 (file)
--- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml
+++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream},messaging4transport-distribution-{stream}'

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 3bf39b5348badfce8c58218ad0bda3873f8dc7b2..f876f7d5831b0740007953aff5c580da45512293 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -2,7 +2,6 @@
     name: messaging4transport-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: messaging4transport-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: messaging4transport-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml
index a6d246f91f7acfa1e9b0450418731415040e1b5e..f0c2d680025a5e249054d5abacdacfdcce94181d 100644 (file)
--- a/jjb/natapp/natapp-csit-basic.yaml
+++ b/jjb/natapp/natapp-csit-basic.yaml
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowplugin-distribution-{stream},natapp-distribution-{stream}'

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index 3aec5087d2aa02d091c3880819df6f2d60d47925..da68b4dd81177da5f861febc10e08e6e42280400 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -2,7 +2,6 @@
     name: natapp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: natapp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index dc6a21119fa1161f17a75dbacb51d5fc43398581..f575c9e267e531c1ce41efccf7bf089181f63be1 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'nemo-distribution-{stream}'

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 530afd30ac2be41d7b99f153590e8e36d928304d..50d259bda4074063c34e71621763125ca9b2e13a 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -2,7 +2,6 @@
     name: nemo-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: nemo-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: nemo-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
index 3bdbcf751c96917657c0f6d4a0eb4c65c269a8a8..c195e532d94f5df7f2bc4db57bf632d423a92121 100644 (file)
--- a/jjb/netconf/netconf-cluster-stress.yaml
+++ b/jjb/netconf/netconf-cluster-stress.yaml
@@ -34,9 +34,3 @@
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs:
-        controller-distribution-{stream},
-        netconf-distribution-{stream},
-        integration-distribution-merge-{stream}

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 751ee7024f60e6d3c3cd7e604ef9365d1d0a4cfd..d8c1d4b0e41c72191e404461882fcbb87197a954 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -32,8 +32,3 @@
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # This scaling test can take several hours to finish,
-    # so the job is defined to run once a day.
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index dc8aa3d06a8517599f985161f5ba051515f1a193..0f24660244501c70661866b3fabc29dfc833e36c 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 2f9f6455b50a0ae81d00b90d5001c9c2c1106839..3549a3bfcb1ca2089fd297786bb4bee9e3928733 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -37,10 +37,5 @@
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
-    # This scaling test can take several hours to finish,
-    # so the job is defined to run once a day.
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # ODL system configuration
     odl_system_flavor: 8 GB General Purpose v1

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index ab26168116fe7d955a3ca360e39df02b29488e9f..bbf91ebc8eb02147138dfd2eaa9e04d44b752e2d 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -37,6 +37,3 @@
 
     # Robot custom options
     robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream}'

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 792311c9d9bdbb012471d9a1b4b1b4bd2ac833fd..468e00134de516b3686b641bcb8393d170440456 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -2,7 +2,6 @@
     name: netconf-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: netconf-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: netconf-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
index 436170333515e4ca84b58eda1b1b1f301269101e..65e8680464f3834ad1b83d167596eb5471470774 100644 (file)
--- a/jjb/netide/netide-csit-basic.yaml
+++ b/jjb/netide/netide-csit-basic.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},netide-distribution-{stream}'

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 999d115a28fb9876925abf77c35054cd63c130e2..68d5bcd1c940607c5ad7d40b787b6166c4440e2e 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -2,7 +2,6 @@
     name: netide-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: netide-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: netide-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 8e310c787b9c9c2b98facfde6ba6ce7cd46f0506..57eb561035d1df03326b58c535dc6dda43c3e21c 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -24,10 +24,10 @@
             schedule: 'H H/4 * * *'
             sg-mode: 'transparent'
         - upstream-stateful:
-            schedule: 'H H * * *'
+            schedule: ''
             sg-mode: 'stateful'
         - upstream-learn:
-            schedule: 'H H * * *'
+            schedule: ''
             sg-mode: 'learn'
         - gate-learn:
             schedule: ''

diff --git a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
index d7b665bbb340f6929325068ba68a628b49110bce..15731ac4e9292c93ea7a0207dba329c72808e87b 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
@@ -31,6 +31,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'netvirt-distribution-{stream},ovsdb-distribution-{stream}'

diff --git a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
index 924d3243c07d900105e22978f5f569fe896f7427..c1644ad969d7d8d61fc9df6c21a5aa2c4894dfcd 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
@@ -23,7 +23,7 @@
     # The project name
     functionality:
         - upstream:
-            schedule: 'H H * * *'
+            schedule: ''
         - gate:
             schedule: ''
 

diff --git a/jjb/netvirt/netvirt-legacy-csit.yaml b/jjb/netvirt/netvirt-legacy-csit.yaml
index 91e12f4b97f413e2c9a178df352dd617b046e3d8..34b88e909e4215dee6b026d01a1d89250a9b4e47 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit.yaml
@@ -36,6 +36,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},netvirt-distribution-{stream},ovsdb-distribution-{stream}'

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 06fd014274da0a247257bdfca978faa79da81e37..1b08b1017207054f7ef49221c98c45c7c2b6e7ff 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -2,7 +2,6 @@
     name: netvirt-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: netvirt-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: netvirt-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -87,7 +84,6 @@
     name: netvirt-vpp
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 633b377ed7db85e821d2d204c1efe7b70138e851..202629ed8fa8821b9b6b979b5036b190e4f25b6d 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -2,7 +2,6 @@
     name: neutron-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -31,7 +30,6 @@
     name: neutron-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -59,7 +57,6 @@
     name: neutron-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index e53c2bf50af6a4bf5463c52d2514c714e94a8769..6d586f92dac5b1cbeb9bd78c8294bfc77df0692d 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -2,7 +2,6 @@
     name: next-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: next-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: next-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 3e2fec7ba933cd5d3abee5693e75a6d3ab9c4330..2b3e4da0fcf7519eae6300cc8285e733f9e133a5 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'nic-distribution-{stream},vtn-distribution-{stream}'

diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml
index 16bf3c78622af680c2d1483a762c8aaea3acf412..1944af84a49eefb2ed552c1a041c74590d2b297f 100644 (file)
--- a/jjb/nic/nic-csit-vtnrenderer.yaml
+++ b/jjb/nic/nic-csit-vtnrenderer.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'nic-distribution-{stream},vtn-distribution-{stream}'

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 448eb76e2e3436bc3709eec693b13b4ee272eb0c..0c3a965c15bdf9d2fbec2ac323df080fa530748e 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -2,7 +2,6 @@
     name: nic-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: nic-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: nic-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
index 0d00827bc6de337005b35667dbe216865dcac2c2..c27a0721112161e6787ad7dfd4356d36c49c0886 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ocpplugin-distribution-{stream}'

diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
index 12644994da9a9d85349b321049043c2aa7d73106..f550aa50538abf8b192056bad4167072e390aa62 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ocpplugin-distribution-{stream}'

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index 4795b7b6cda0989fd624fd1f80ad36fc2f0740b1..0a9aa7d916dc9b154ef47a5ca4338d5219803bac 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -2,7 +2,6 @@
     name: ocpplugin-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: ocpplugin-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index df84b5a647115e01af0bb3f5c0b5d9b334f93ac3..58e44299e9c786e4c95bc4dcca73a49c7fb33074 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,7 +2,6 @@
     name: odlparent-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: odlparent-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: odlparent-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml
index acad73675eee59c1d2922869948ccd4b926cc742..a2800d1d45d03a5fc03fa303d7cb6eca80f1d6c4 100644 (file)
--- a/jjb/of-config/of-config-csit-basic.yaml
+++ b/jjb/of-config/of-config-csit-basic.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'of-config-distribution-{stream}'

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 1885224667a2bd6c9970115942eb87b39190bc2b..ba9909535c309e6cc0d8a7d06e6ee1cc825284a1 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -2,7 +2,6 @@
     name: of-config-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: of-config-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: of-config-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index 04e990773f0ead5984cb1e5533cd0f287e088058..12f7c54e11cc3ea85cd927b43b2eb5308770dcb6 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -2,7 +2,6 @@
     name: circuitsw-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: circuitsw-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -54,7 +52,6 @@
     name: circuitsw-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index d399af964eb89fc8c7725b9896ff51395500b492..ed098fd66429d1686976fcea8f4c1414a9bace2d 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -2,7 +2,6 @@
     name: openflowjava-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: openflowjava-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: openflowjava-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml
index de59d6fc2b85c1bfa8ea79d00d8547cf350f592f..4ac442e6c840e0fcead4e2fb65c84b2e7cc162b3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: '-v flnr:50000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'REST setup rate (for 100k flows)'
     01-plot-yaxis: 'setup time[s], req[flows/s]'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
index edd6e4b9ee1f6764e8dc361f769439d6ca136dda..8fdb4052aa073c7abac70b2e934f527a0063a766 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v flnr:50000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'REST setup rate (for 100k flows)'
     01-plot-yaxis: 'setup time[s], req[flows/s]'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml
index e9149f4ae7feada50cc033fa18fa6a9cf865eb62..9103bf64ffe86e471a2f777b3e32119eba9e623a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml
@@ -24,6 +24,3 @@
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:helium'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
index ca6bf88251c66dccdb37112c72637dac0e215cf7..c108689fb2f730a84d987aa5d8aac6937e2744c8 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
@@ -27,6 +27,3 @@
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
index fc77dc7dca5a31a3618e083adcfda989c0480fa0..739c3415c05da89ba86478063322a5a2dbcd5f38 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:helium -v oper_ds_timeout:1000 -v switch_count:32 -v flow_count_per_switch:2000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
index a507761ea80d5773cd19156305ef02d9a981f1c0..49ca7c55992f8b2e10e6e228480275e243db995f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
@@ -32,9 +32,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml
index 843d15e4c76138ba886adb0a7716701e8ef2d47c..0921246f54d6d45ff77e6f75f3cba16a9a4d2b61 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count_per_switch:2000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
index 3c245f23fb1cf9a82266d1191f83f776f7bfcf38..2d8ac0b47d3e040fd385c623591c77c4d33ff121 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
@@ -32,9 +32,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
index d4c2e22a41249fa27c6cf25e68d741bf8d2fb04d..a27a1330b4d85e55e9bae6e364e3aafc569c4009 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Throughput Mode'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index 3260786da724c64e592878e43e20b80043682018..bca1b51964f5d64f5fea4f0d3458dffaa2d32bcf 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Throughput Mode'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
index 9369afefc2ac2b30df05a992ab87ba9dd548b92b..00ee09ee25abe306926ca1ace09b2051fed2cbb3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
     # Plot Info
     01-plot-title: 'Throughput Mode'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index 18840b86139f962110cd78bc76e51ee947d2c347..718fd413b48678725f3964fe0c9cfce30d15f8fb 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
     # Plot Info
     01-plot-title: 'Throughput Mode'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
index 99091cfed75e7a35c2cbec930822b6ab183a8b66..fad490aa32bfdd334795cf1da87869620693c4e4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
@@ -24,6 +24,3 @@
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:helium'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index c10d0975023f429c8504b7f1e5b0f64d8ba90ad5..a423930ee422d085f9db0ff496e905329d10c7fa 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -31,6 +31,3 @@
 
     # mininet image
     tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml
index 829aaeec787b8ab735ff07cce2014caac8ee899a..9a9d31f8adf9076828834788873a1a2800409f61 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
     # Plot Info
     01-plot-title: 'Flow REST API Rate'
     01-plot-yaxis: 'http_req/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
index c24df399ed46cb9a0b94355ed683a5a51616a4b1..7197a4125efdc32c58ce7d1355b269573456545a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
     # Plot Info
     01-plot-title: 'Flow REST API Rate'
     01-plot-yaxis: 'http_req/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
index ae0718ea0b4e75e17d3a94a2c2260e9c8957d20a..68cadd2fe4e850653026167896064219b8649365 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
@@ -31,6 +31,3 @@
 
     # mininet image
     tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
index f4eff57e5228bd22116b17a9b22bb83c666693e3..c09c26407d174f6acab2078e17172c1b9ba8ba01 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
@@ -29,6 +29,3 @@
 
     # mininet image
     tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index d76163a49245b2b180abc89196867917807ff6af..6fab15d63430f310a1cea5b758c6acc647d4db44 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -33,6 +33,3 @@
 
     # mininet image
     tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
index 0cbce891404d99f2184138d9aa79789b089cedd5..49297549df5a73c4612d278e0ca9be69a5551fd6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Maxmum Links Full Mesh Topology'
     01-plot-yaxis: 'Links'

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index f45aa573057ae5c35525bbcb6af4ecc04e53c98f..dd2fe3b087a4654a61e5f2cd946c95d47f8a3614 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -31,9 +31,6 @@
     # mininet image
     tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Maximum Links Full Mesh Topology'
     01-plot-yaxis: 'Links'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
index be18e675ee390f408146d897f4658b2a80cb9c48..09832e77f92ed07aa9daf7f9c0a6451883242443 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
@@ -25,6 +25,3 @@
 
     # Robot custom options
     robot-options: '-v TEST_LENGTH:23h'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 3debf748cdd8d4b99fbf10c6a5d567a2b6ed9698..98a0842d269d9d8f195eeebfe2abbc0d4af5a265 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -32,5 +32,5 @@
     # mininet image
     tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
+    # Trigger jobs (on saturday)
+    schedule: 'H H * * 6'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml
index 796951c11fb26759f6d183861b233d31e0087c71..ced3ab35f560021d636d6049dce0a31304084c52 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:helium -v oper_ds_timeout:1000 -v switch_count:32 -v flow_count:64000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
index f984d9b0f7bf442549bb8f43bc71b45476473b6c..e50c9570e6fa92324557c2b5fccbc1394d0e295c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
@@ -32,9 +32,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:64000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
index 7b30d5a3a69e9cb6dd5beb0de8958186d2406826..d05faddebb4f2126fae0db74155fccedc3af0718 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count:64000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
index adb77dd6ea3a27503ca8c3dbd4ec4afa40550cfa..c456d39c161310154e1df0287263de899c2bda9b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
@@ -32,9 +32,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:64000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml
index 5d7c7d92bd241b9a6006045313b107eac7c363d1..0bf0cc6c0b2d512a84e96f135b9c88256e554c71 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'REST setup rate (for 100k flows)'
     01-plot-yaxis: 'setup time[s], req[flows/s]'

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
index 1fd2c9ab0d26cf90ad4895f532d96007a04943af..c124bbc9ea8706f8cb6a529616761ec1bea67b1e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'REST setup rate (for 100k flows)'
     01-plot-yaxis: 'setup time[s], req[flows/s]'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
index 8e702b6b9d902bd6ba659374fcb232fb0894a574..4faf10197ed19d04f7f4b070b1700538af280283 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
@@ -24,6 +24,3 @@
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:7'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index 9e31b0a3fc7c873ddd3b5dfcb1967bf5631700d7..66750821c8ca8df91459e73b9d7a1bcb1e1f4583 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -27,6 +27,3 @@
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:7'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
index c74001a68a80098e4cc0fc7b91a15b1eccd5a097..32abb0a37e75e72da653726c1d17fcfde2d084e5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v flnr:50000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flows (100k) Setup Time'
     01-plot-yaxis: '[s]'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
index 2a2854b819f2b42398c8b1e7e41cd7da159042ea..1a59ff240429fe574f035a322abd18a7fc3cc8fd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: '-v flnr:50000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flows (100k) Setup Time'
     01-plot-yaxis: '[s]'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
index 033fe811bb2df7e68b570a3e36fa345a8de6b79e..7892556b452cb832e6bda785d1ec9b2aa335d215 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v flnr:50000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flows (100k) Setup Time'
     01-plot-yaxis: '[s]'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
index e9b87608a495c047af2f68d22457704c98095192..574b623b17cf8836ba702840cfc7ded318da2061 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Maximum Switches Linear Topology'
     01-plot-yaxis: 'Switches'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index de535f19091449f45dfd5d4e59be17f7d5658f3b..22ca774842cd57e496f1de2f6680488c3bbff815 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -31,9 +31,6 @@
     # mininet image
     tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Maximum Switches Linear Topology'
     01-plot-yaxis: 'Switches'

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 7e7db5a7d22b9f673e3a371bb3792207ea044027..aa8228d20177479d2fef683afe2bd772c1c22fca 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -2,7 +2,6 @@
     name: openflowplugin-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: openflowplugin-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: openflowplugin-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index fffaad026ab9a666e28d85cbd258c4e6314a85ac..07117bb3cb0aec022b51138037d95fd6bd0ab92d 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ovsdb-distribution-{stream}'

diff --git a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
index 01deef60a5211a24499503927895af7a17d780bb..1a8ccf533a3a42655a8452a8504c03c0ac6817c3 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
+++ b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
@@ -31,9 +31,6 @@
     # Robot custom options
     robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:100'
 
-    # Trigger jobs (daily)
-    schedule: ''
-
     # Plot Info
     01-plot-title: 'Max number of Switches'
     01-plot-yaxis: 'OpenFlow Switches'

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index cef56dea87ed40bba38db02c45456911ad89ab0a..92dc18a4ce94b005248305c21981f735d11e1746 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -35,6 +35,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ovsdb-distribution-{stream}'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 189317cfa04b8820c1faced68d8b3a9e6d9f447b..07cd2074f761286d76c47445923e325793cbdae2 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -2,7 +2,6 @@
     name: ovsdb-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: ovsdb-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: ovsdb-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index 357cbbb1aba7b5c2e675f0621f84b708fae89694..486edac85b702cb1bc891a89d1b530594c47da93 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -33,7 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        packetcable-distribution-merge-{stream}

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 3973fbd2347557ee9e56cda57833e320916a2b4e..3b5bf16be4be9cd2a59317c03efe708bd93f672d 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -2,7 +2,6 @@
     name: packetcable-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: packetcable-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: packetcable-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 503ab86153c09686988126fc07a5c2e2a882bee1..f2fb88b077d3bab7b58700926ac2e786fd419632 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -2,7 +2,6 @@
     name: persistence-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -29,7 +28,6 @@
     name: persistence-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -56,7 +54,6 @@
     name: persistence-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 45324bfcef19c70745c880075ac870358f06ef1a..aa6caa13c92870785d88ee5ea68f53d11d7620cc 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -60,74 +60,6 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
-- job-template:
-    name: '{project-name}-distribution-{stream}'
-
-    # Required variables:
-    #     stream:    release stream (eg. boron or carbon)
-    #     branch:    git branch (eg. stable/boron or master)
-
-    # Need to keep jobs that deploy to Nexus at end of build as Maven
-    # projects. Maybe reconsider this once upstream moves deploy to a
-    # separate lifecycle:
-    #     https://issues.apache.org/jira/browse/MNG-5666
-    project-type: maven
-    node: '{build-node}'
-    jdk: '{jdk}'
-
-    properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-        - opendaylight-infra-parameters:
-            project: 'integration/distribution'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-
-    scm:
-        - git-scm:
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - reverse:
-            jobs: '{project}-merge-{stream}'
-            result: 'success'
-
-    prebuilders:
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: '{mvn-settings}'
-        - distribute-build-url:
-            path: 'distribution-karaf/src/main/assembly'
-
-    maven:
-        maven-name: 'mvn33'
-        root-pom: 'pom.xml'
-        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: 'integration-distribution-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project}]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
-
 - job-template:
     # Template: {project-name}-distribution-check-{stream}
     # Goal: Build a patch and make sure the distribution can deploy with this change.

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index 4a84610156b50067ea2c2c063bcffdf178630a46..a89a6411d546cc43fd5db43d90d1943f2702fcee 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -2,7 +2,6 @@
     name: reservation-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: reservation-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -54,7 +52,6 @@
     name: reservation-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
index 26794a1da52ad04c128681596ac3c8eb5f43c6d2..b0fe4acdccfc74cc2ab5415f27821e2ef3f89658 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
@@ -31,6 +31,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowplugin-distribution-{stream},sdninterfaceapp-distribution-{stream}'

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index ea9086eca51f0c89d3e7cae2a1d703fa4d055e36..ffe1bf9c75b7f18a17d4b1e474f0a81395df6ec8 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -2,7 +2,6 @@
     name: sdninterfaceapp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: sdninterfaceapp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: sdninterfaceapp-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml
index 042edc14f44d31d0d6d59c84ecbe39468694cd82..4a3f37131d2c0ef76cd0b512778104371d036771 100644 (file)
--- a/jjb/sfc/sfc-csit-full-deploy.yaml
+++ b/jjb/sfc/sfc-csit-full-deploy.yaml
@@ -27,6 +27,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'ovsdb-distribution-{stream},openflowplugin-distribution-{stream},sfc-distribution-{stream}'

diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index 039238c5c0072f620f5ae0af958247748552f45f..8d60f9fcafd64c42e1077d5cd32c5048153adaaf 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'lispflowmapping-distribution-{stream},ovsdb-distribution-{stream},openflowplugin-distribution-{stream},sfc-distribution-{stream}'

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 9355778ae7d6429f047bf47d2508ad9ca2fb7181..3470a5516b60b00d3f2160f450f2ec14b094965a 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -2,7 +2,6 @@
     name: sfc-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: sfc-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: sfc-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index a56407b60aab4b0f3440d49e0dd63c58d299f341..60ab2c24d354013956bae27da769bb3e9d0c4778 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -2,7 +2,6 @@
     name: snbi-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: snbi-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -59,7 +57,6 @@
     name: snbi-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml
index d0ba1ca0d859df13a9caf64abb9955330bdf0939..e1fcc8da746c2b01e478ce11160ed2f9a0ffee56 100644 (file)
--- a/jjb/snmp/snmp-csit-basic.yaml
+++ b/jjb/snmp/snmp-csit-basic.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},snmp-distribution-{stream}'

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 0b4fccdf055fd7925d22bbcc9d0070a61a6d7f4f..68662eafe99f9fa3829c526d7413b3ad92b323de 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -2,7 +2,6 @@
     name: snmp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: snmp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: snmp-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index a0fab82be51ff1b55e005890a3b03c48ea3b2e4b..7c23643f1a73444af66c2876a62911e797ec6d9d 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -2,7 +2,6 @@
     name: snmp4sdn-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: snmp4sdn-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: snmp4sdn-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 076daab658d7df9191909f6120e9d45e60208eae..a374b66aaf9d862765d98c1c8bd7e1e696c64d40 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}'

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index 5dbe4126daeeb56b3a789ce1a2ae2153b3700f70..e8a845c9cfb9548bedf4e5b7d1d601523b6d1fea 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -29,7 +29,3 @@
 
     # Robot custom options:
     robot-options: ''
-
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'
-

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index a964198314f5a37afa5b5ed291f5b53e29ebed17..ecd7d318a6ccd757df22f24d23285e7b77e38087 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}'

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index ba2a2594e3df7bbdedf919b27ab7b57bac0b3f2b..ecf8e43d2c317ad8601973b0fa567060a0b77e73 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -26,6 +26,3 @@
 
     # Robot custom options:
     robot-options: ''
-
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 19e7206c5c6ceace25079f344b85e35d2212f8c0..5b6d6fc987f1d75e0dd344c20f8513f17afe76c2 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}'

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 703876691306c3b86f0e75b2b1d6654f315659c7..d404988abe8198e6d7e05fd2698d5566f4d9b22c 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -2,7 +2,6 @@
     name: sxp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: sxp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: sxp-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml
index 041439d6330096d18238b98e877ed4c935c5bf09..91c68f764666c14974a184323a72f0b7962e1e24 100644 (file)
--- a/jjb/systemmetrics/systemmetrics.yaml
+++ b/jjb/systemmetrics/systemmetrics.yaml
@@ -2,7 +2,6 @@
     name: systemmetrics-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -34,4 +33,4 @@
     branch: 'master'
     mvn-settings: 'systemmetrics-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index e79eca7b4064946dd1adb11b02767bc8d58c710a..29e83fe765dfc8966465772fcb1324a897d81b2d 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -2,7 +2,6 @@
     name: tcpmd5-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -29,7 +28,6 @@
     name: tcpmd5-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -56,7 +54,6 @@
     name: tcpmd5-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
index 759b1c89700e9afe18058eb61d2e46893bf0a940..52081aaab7919d4a73ad94382af022f0ff4b1dff 100644 (file)
--- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
+++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
@@ -33,11 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        controller-distribution-{stream},
-        aaa-distribution-{stream},
-        integration-distribution-merge-{stream}

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 81a28538599356cf341040f608eb79f23a4ca36e..80e34c6e638a9e3e5346b7ffe902423ed64d6d0b 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -2,7 +2,6 @@
     name: topoprocessing-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: topoprocessing-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -59,7 +57,6 @@
     name: topoprocessing-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index de3b6c4c308d6e2813e78f6b84be713e14a1d06a..c710d3c2a802169c493b636129f284cc4eb2f77b 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -2,7 +2,6 @@
     name: transportpce-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index c08458fd15428d7ff9532feda42553de5b0cdb92..31b3eadafc29c56567ef19bf28f2ce78bedb44f0 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -30,7 +30,4 @@
     install-features: 'odl-restconf,odl-tsdr-cassandra,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
 
     # Robot custom options
-    robot-options: ' '
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
+    robot-options: ''

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index e75bbb64c7e1e9e66b68ef45529340c7d5abf188..a08d5d29df8ccb6df967dbcf34774b7b78523ebd 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 85c6060e427d8a7ad7249dc6a95bf13305a84282..8685354198d87c411c4f10ba99d47ee8d677345f 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 5c40b899e4e6885e8608bbe1612a03147e0fd95e..cc1b1a4118fe645d62ccde888f1d04c7bec12600 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -2,7 +2,6 @@
     name: tsdr-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: tsdr-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: tsdr-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 1aabef817bee8aebfa639e4a181f847c3f5f98fb..b7e3f8efc9b316fd8fc861563783bbe4455043d5 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -2,7 +2,6 @@
     name: ttp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: ttp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: ttp-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index 6448505203a34d5bc8e0ac6182a4dcaaeabf895f..386727e6a0030cf6753a631ebebaa7834baf111a 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -36,6 +36,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'ovsdb-distribution-{stream},unimgr-distribution-{stream}'

diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml
index fc0d5daa88d4276cd1fd94030425666c3ff97c7c..34cfdb175191fa8b9a50137db2b9cdeeb8b9016b 100644 (file)
--- a/jjb/unimgr/unimgr-csit-legato.yaml
+++ b/jjb/unimgr/unimgr-csit-legato.yaml
@@ -36,6 +36,3 @@
 
     # mininet image
     tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'ovsdb-distribution-{stream},unimgr-distribution-{stream},netvirt-distribution-{stream},genius-distribution-{stream}'

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 1e9cb13c87736fe243b7781f6a03c0434d9e1c4a..4151a16a5d1b0455c0ca9ce2bc3c701f0de71fea 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -2,7 +2,6 @@
     name: unimgr-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: unimgr-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -59,7 +57,6 @@
     name: unimgr-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index d31b4ad3e7ce7999424b8cfaa684bbd4ad735c5b..cbe283f86a80b5acf0732d16cd31abfb5d729060 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},usc-distribution-{stream}'

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index a117d2835fbf0946a1a7ef5dd4043a9d46b5f27c..a6b6122f19c61e572b039df13d2ad043faba3f06 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},usc-distribution-{stream}'

diff --git a/jjb/usc/usc-csit-udp.yaml b/jjb/usc/usc-csit-udp.yaml
index 088838e6efbb9dfe9fa524c0d4d140f07cbea5c8..66a9e7dbfc5953cc0984e9778069a359a9d1c2b0 100644 (file)
--- a/jjb/usc/usc-csit-udp.yaml
+++ b/jjb/usc/usc-csit-udp.yaml
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},usc-distribution-{stream}'

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index e0360721c572a7cc159b6fc95819f750b81f4109..abe995519ae0a3414e6e5a0e0cd33cdbb3fc8064 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -2,7 +2,6 @@
     name: usc-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: usc-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: usc-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
index 910cbab58e6a7ffca1c2e4d2cc740f943bf9cb6d..e902519fb70a36cd132b22600fc6b67017a21d40 100644 (file)
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowplugin-distribution-{stream},usecplugin-distribution-{stream}'

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index d04d065a112a5cc743d3e5621a6ad7f56b1f9eb1..f9cf80a554d21dbb7468d3cf20fe626ca1be9116 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -2,7 +2,6 @@
     name: usecplugin-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: usecplugin-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: usecplugin-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index ceacf73629184aff6b16f64d208d55dd28ece42c..80a47b6ca0c1bcb85970810fd0ee0e2fc2c52054 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -2,7 +2,6 @@
     name: vpnservice-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: vpnservice-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -54,7 +52,6 @@
     name: vpnservice-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
index 0c07ba78e42e74c8c8b15b7e2f33b967ee42dc43..90663721f8c889fcad83edb996ba7bfd9a601be9 100644 (file)
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ b/jjb/vtn/vtn-csit-3node-manager.yaml
@@ -32,6 +32,3 @@
     robot-options: ''
 
     tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 395ca6bc9496325ae5502f717c244f366092a3e9..6581a3395de6762d0cbcb16e78f6bdb524dd1085 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -34,7 +34,3 @@
 
     # Robot custom options
     robot-options: ''
-
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index 203d811a41801ffd96600e2ef5bc4736c3f6bd2a..5a9e295530e08f3a370904f86232472b673af0ae 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -36,6 +36,3 @@
     robot-options: ''
 
     tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 76bed461be7d7157bebd42ef45f2b29aa49c7c26..3b329e1dc38518d9d0adf0ba1a30e96d30a59e09 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -39,7 +39,7 @@
             odl-ml2-branch: 'master'
             odl-ml2-driver-version: 'v1'
 
-    schedule: 'H H * * *'
+    schedule: ''
 
     odl-enable-l3: 'no'
 

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index b26d38e94304472c3fa94ed1918aa75529e8c2e1..a6954dc7834442aa524b6c0a66544ed194f8afc6 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -2,7 +2,6 @@
     name: vtn-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -34,7 +33,6 @@
     name: vtn-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -66,7 +64,6 @@
     name: vtn-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 7c4852b3e7e65c634df45216f807e8fda5c311bb..557b84d28a9331fb00926ec09c1672becf1ffa9b 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -2,7 +2,6 @@
     name: yang-push-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: yang-push-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: yang-push-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index 9d09dac5089361e0abff15714ebdb95e5d7508c8..7ed721fdf3bbaec33cbb6c8bbd9a35564b70b669 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -2,7 +2,6 @@
     name: yangide-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: yangide-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 313ba85c9bfd7535406fd8e3f8287169e26979e9..5c59cd0914426593f3acaa12a8a9beeb50a5223b 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -33,6 +33,3 @@
     # Additional patterns to archive
     archive-artifacts: ''
     # FIXME: Delete if no patterns.
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 3b3c7e581b87154ed0cf78f904cbf446efd6f1d8..cb35c40517374ea955c0165c5b3061c3fb4282f8 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,7 +2,6 @@
     name: yangtools-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: yangtools-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -60,7 +58,6 @@
     name: yangtools-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'