Merge "Add cronjob to trigger all packer jobs periodically"

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 58cd51e1be613e21e37f3d3ce321646196b28147..2e62a848da9e8752aebda744da87ebec52712526 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -85,6 +85,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[autorelease]'
         - trigger-parameterized-builds:
             - project: 'integration-distribution-test-{integration-test}'

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 2c196b272b7120418828a3d7b1293fb9403ce641..a24dcceee5fadaee764f1526d1ea6ff1df229fb6 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -59,6 +59,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[docs]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -130,6 +131,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[docs]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index e94e89118d40c59cb7eb0c6ae54ce3ff4a617cba..2dce6df73907a2b293851f96a451cf2b3b280bbd 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -1,35 +1,3 @@
-- project:
-    name: docs-carbon
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: True
-    project: 'docs'
-    project-name: 'docs'
-    branch: 'master'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
-    mvn-settings: 'docs-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[docs] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: docs-boron
     jobs:

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 046c7e99e3de7e54041c1067787b378ee354f6ab..f1d66f094ac581acdb80dddd1d7f216521ec7b40 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -11,7 +11,6 @@
         - carbon:
             branch: 'master'
             jdk: 'openjdk8'
-            csit-list: >
         - boron:
             branch: 'stable/boron'
             jdk: 'openjdk8'
@@ -21,7 +20,7 @@
             csit-list: >
                 netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream}
 
-        - all:
+        - genius:
             csit-list: >
                 genius-csit-1node-genius-only-{stream},
                 genius-csit-1node-genius-all-{stream}

diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh
index af35a3ab768612a14c51dcc69d51a8a5418b2cac..3873406ff6ccedca50806228a01f73dae910ab1a 100644 (file)
--- a/jjb/include-raw-deploy-archives.sh
+++ b/jjb/include-raw-deploy-archives.sh
@@ -89,8 +89,8 @@ touch $ARCHIVES_DIR/_sys-info.txt
 
 # Magic string used to trim console logs at the appropriate level during wget
 echo "-----END_OF_BUILD-----"
-wget -O $ARCHIVES_DIR/_console-output.log ${{BUILD_URL}}consoleText
-sed -i '/^-----END_OF_BUILD-----$/,$d' $ARCHIVES_DIR/_console-output.log
+wget -O $ARCHIVES_DIR/console.log ${{BUILD_URL}}consoleText
+sed -i '/^-----END_OF_BUILD-----$/,$d' $ARCHIVES_DIR/console.log
 
 gzip $ARCHIVES_DIR/*.txt $ARCHIVES_DIR/*.log
 # find and gzip any 'text' files

diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 8fbe6af441b2354ce9ff1cad2f0d04caf444511a..7f26dbc0e805168ab52d8acd4d93c7ab8538a4bc 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -24,7 +24,7 @@ set -exu
 # Make sure pip itself us up-to-date.
 pip install --upgrade pip
 
-pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr
+pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr pyhocon
 pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library}}
 
 # Module jsonpath is needed by current AAA idmlite suite.

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 33110dc1924b290c6ceafb58d5b67cbb5d9e96d3..486d164f3964efff5b4dc28752f342ca46be1a10 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -96,6 +96,7 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
 
 
@@ -202,6 +203,7 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
 
 # Template: integration-distribution-deploy-{stream}
@@ -249,6 +251,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
@@ -298,6 +301,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 3a6e64c99d0b1584338325da740ebad927d3726f..63a9537d09d70b9301b2b8b67802ab9913c01793 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -103,6 +103,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
@@ -187,6 +188,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
@@ -297,6 +299,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
@@ -409,6 +412,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
@@ -494,6 +498,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
@@ -606,6 +611,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
@@ -717,6 +723,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
@@ -834,7 +841,7 @@
             openstack-vms: '{openstack-vms}'
 
     triggers:
-        - integration-csit-all
+        - timed: '{schedule}'
 
     builders:
         - integration-copy-ssh-keys
@@ -857,6 +864,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
@@ -952,7 +960,7 @@
             openstack-vms: '{openstack-vms}'
 
     triggers:
-        - integration-csit-all
+        - timed: '{schedule}'
 
     builders:
         - integration-copy-ssh-keys
@@ -976,6 +984,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
@@ -1086,6 +1095,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
 
 

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 0c385654b14018bc129f5292dde4d4388fe9cfac..d3543774466e31bfa8aef64d51c09720057e30c1 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -176,6 +176,8 @@
                 vtn-csit-1node-manager-all-{stream},
                 vtn-csit-1node-coordinator-only-{stream}
 
+    # mininet image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
 
 # Template: integration-csit-verify-1node-library
 # Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)
@@ -266,6 +268,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[integration]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
@@ -305,6 +308,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[integration]'
 
 # Template: integration-patch-test-{stream}
@@ -408,6 +412,7 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[$GERRIT_PROJECT]'
 
 # Template: integration-multipatch-test-{stream}
@@ -476,4 +481,5 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'

diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
index e25f66ebaa8427b2bb73546e5dd0500f9c82939e..1cfa363ab1a73450f71d73d32ad36d41fcdf9a6f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
@@ -3,11 +3,21 @@
     jobs:
         - '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
 
-    # The project name
     project: 'netvirt'
 
-    # The project name
-    functionality: 'openstack'
+    functionality:
+        - upstream-transparent:
+            schedule: 'H H * * *'
+            sg-mode: 'transparent'
+        - upstream-stateful:
+            schedule: 'H H * * *'
+            sg-mode: 'stateful'
+        - upstream-learn:
+            schedule: 'H H * * *'
+            sg-mode: 'learn'
+        - gate-transparent:
+            schedule: ''
+            sg-mode: 'transparent'
 
     stream:
         - carbon:
@@ -16,9 +26,6 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
 
     openstack:
         - mitaka:
@@ -30,13 +37,11 @@
 
     openstack-vms: 3
 
-    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    schedule: 'H H * * *'
+    install-features: 'odl-netvirt-openstack'
 
     odl-enable-l3: 'yes'
 
-    public-bridge: 'br-ex'
+    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
@@ -44,4 +49,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'none'
+    security-group-mode: '{sg-mode}'

diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index d518096f256623b5ca63704779a465fd41cc528a..768b19629dd051ce71d12adf25200e9159b83b5a 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -3,11 +3,21 @@
     jobs:
         - '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
 
-    # The project name
     project: 'netvirt'
 
-    # The project name
-    functionality: 'openstack'
+    functionality:
+        - upstream-transparent:
+            schedule: 'H H * * *'
+            sg-mode: 'transparent'
+        - upstream-stateful:
+            schedule: 'H H * * *'
+            sg-mode: 'stateful'
+        - upstream-learn:
+            schedule: 'H H * * *'
+            sg-mode: 'learn'
+        - gate-transparent:
+            schedule: ''
+            sg-mode: 'transparent'
 
     stream:
         - carbon:
@@ -16,9 +26,6 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
 
     openstack:
         - mitaka:
@@ -30,15 +37,13 @@
 
     openstack-vms: 4
 
-    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    schedule: 'H H * * *'
+    install-features: 'odl-netvirt-openstack'
 
     odl-enable-l3: 'yes'
 
     enable-haproxy: 'yes'
 
-    public-bridge: 'br-ex'
+    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
@@ -46,4 +51,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'none'
+    security-group-mode: '{sg-mode}'

diff --git a/jjb/netvirt/netvirt-csit-clustering.yaml b/jjb/netvirt/netvirt-csit-clustering.yaml
index 1b9f891f0532a56991697361e73da18f4c3e6798..d7b665bbb340f6929325068ba68a628b49110bce 100644 (file)
--- a/jjb/netvirt/netvirt-csit-clustering.yaml
+++ b/jjb/netvirt/netvirt-csit-clustering.yaml
@@ -1,11 +1,11 @@
 - project:
-    name: netvirt-csit-clustering
+    name: netvirt-legacy-csit-clustering
     jobs:
         - '{project}-csit-3node-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-3node-{functionality}'
 
     # The project name
-    project: 'netvirt'
+    project: 'netvirt-legacy'
 
     # The functionality under test
     functionality: 'clustering'

diff --git a/jjb/netvirt/netvirt-csit.yaml b/jjb/netvirt/netvirt-csit.yaml
index 4b11e10b60f402e693382d600dfe951b2fb96f6d..9344def1b103feab0485e214ad99bd65d91d4186 100644 (file)
--- a/jjb/netvirt/netvirt-csit.yaml
+++ b/jjb/netvirt/netvirt-csit.yaml
@@ -1,11 +1,11 @@
 - project:
-    name: netvirt-csit
+    name: netvirt-legacy-csit
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
-    project: 'netvirt'
+    project: 'netvirt-legacy'
 
     # The functionality under test
     functionality: 'openstack-basic'

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index bda7c745a9d2cf06cceae7bb5260503af2b5e454..3b7760beb1874f52f46cd9083cb7c8c296904ea9 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -212,6 +212,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[netvirt]'
         - text-finder:
             fileset: "**/target/surefire-reports/*.xml"

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
similarity index 61%
rename from jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
rename to jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
index 407051640da893352bb89dfc6a935cc2a2111e8f..7a1cac1e004b7b6756d2324a1484d67776a8012a 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
@@ -1,14 +1,17 @@
 - project:
-    name: netvirt-vpnservice-csit-openstack-integration
+    name: netvirt-legacy-csit-openstack-integration
     jobs:
         - '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
 
-    project: 'netvirt-vpnservice'
+    # The project name
+    project: 'netvirt-legacy'
 
+    # The project name
     functionality:
-        - 'transparent'
-        - 'stateful'
-        - 'learn'
+        - upstream:
+            schedule: 'H H * * *'
+        - gate:
+            schedule: ''
 
     stream:
         - carbon:
@@ -17,6 +20,9 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     openstack:
         - mitaka:
@@ -28,13 +34,11 @@
 
     openstack-vms: 3
 
-    install-features: 'odl-netvirt-openstack'
-
-    schedule: 'H H * * *'
+    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     odl-enable-l3: 'yes'
 
-    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
+    public-bridge: 'br-ex'
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
@@ -42,4 +46,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: '{functionality}'
+    security-group-mode: 'none'

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
similarity index 63%
rename from jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
rename to jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
index 50fad15eeb256ad1a6032c3f715b8cd041454890..8194d134b81659ab60cc881172a9b3f32edd5a41 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
@@ -1,13 +1,17 @@
 - project:
-    name: netvirt-vpnservice-3node-csit-openstack-integration
+    name: netvirt-legacy-3node-csit-openstack-integration
     jobs:
         - '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
 
     # The project name
-    project: 'netvirt-vpnservice'
+    project: 'netvirt-legacy'
 
     # The project name
-    functionality: 'openstack'
+    functionality:
+        - upstream:
+            schedule: 'H H * * *'
+        - gate:
+            schedule: ''
 
     stream:
         - carbon:
@@ -16,6 +20,9 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     openstack:
         - mitaka:
@@ -27,15 +34,13 @@
 
     openstack-vms: 4
 
-    install-features: 'odl-netvirt-openstack'
-
-    schedule: 'H H * * *'
+    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     odl-enable-l3: 'yes'
 
     enable-haproxy: 'yes'
 
-    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
+    public-bridge: 'br-ex'
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
@@ -43,4 +48,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'transparent'
+    security-group-mode: 'none'

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index a87bc589df51c755ac2f96e57da9e67c709c5bfd..1f0c6ed97a4d0a8744e834c1aa77b46d7037dbc5 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -19,13 +19,8 @@
     feature:
         - legacy:
             csit-list: >
-                netvirt-csit-1node-openstack-mitaka-openstack-{stream}
-
+                netvirt-legacy-csit-1node-openstack-mitaka-gate-{stream},
+                netvirt-legacy-csit-1node-openstack-basic-only-{stream}
         - current:
             csit-list: >
-                netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream}
-
-        - all:
-            csit-list: >
-                netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream},
-                netvirt-csit-1node-openstack-mitaka-openstack-{stream}
+                netvirt-csit-1node-openstack-mitaka-gate-transparent-{stream}

diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
index 46342585a950d431078033358b261e5d5f39318a..695bb1becebd75c6e911e3d4b3cc79d60922c521 100644 (file)
--- a/jjb/netvirt/netvirt-sonar.yaml
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -127,6 +127,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[netvirt]'
         - jacoco-report
         - findbugs

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index e45b148938d217190434c5313bbec9034b9a24de..658063d7440869dea193c3c0481d3c43e4f81505 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -82,6 +82,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -126,6 +127,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index 6f68a9434528fae392031f7202fc0922d21dc203..87ccc1f1093772d1b1c817ea707fe1fe310f4397 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -119,6 +119,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - archive:
             artifacts: 'install-root/*.tgz'
@@ -155,6 +156,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - archive:
             artifacts: 'install-root/*.tgz'
@@ -198,6 +200,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - archive:
             artifacts: 'install-root/*.tgz'

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 39f3e92320c429c7dc21e7e9fad6b5a288bbd1b6..82b321a6963a618bc0e1d2cdd1b54642b665defc 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -178,6 +178,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[ovsdb]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 44487210bf7adf3f01b2690568c9170aa058fdcb..a1cd88cfdc3225aea818d8f34827caf9043620a6 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -90,6 +90,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[ovsdb]'
         - jacoco-report
         - opendaylight-infra-shiplogs:

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 2e52f4cfa4677aa9295b65e2e6783820d392988c..f06a64028762353effc7b891f5f7e3b83de2ea52 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -25,11 +25,11 @@
             artifacts: '{archive-artifacts}'
         - string:
             name: VERSION_MAJOR
-            default: '4'
+            default: '5'
             description: 'OpenDaylight major (element) version number to build'
         - string:
             name: VERSION_MINOR
-            default: '2'
+            default: '0'
             description: 'OpenDaylight minor (SR) version number to build'
         - string:
             name: VERSION_PATCH
@@ -41,19 +41,19 @@
             description: 'RPM version for the given ODL major.minor.patch'
         - string:
             name: SYSD_COMMIT
-            default: 'c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed'
+            default: '07f7c83b0ef46ad3809e5be03e09a77fe554eeae'
             description: 'Version of ODL systemd unitfile to download and package in ODL RPM'
         - string:
             name: CODENAME
-            default: 'Beryllium-SR2'
+            default: 'Boron'
             description: 'Elemental codename for the ODL release, including SR if applicable'
         - string:
             name: DOWNLOAD_URL
-            default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz'
+            default: 'https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz'
             description: 'URL to ODL tarball artifact to repackage into RPM'
         - string:
             name: CHANGELOG_DATE
-            default: 'Wed May 11 2016'
+            default: 'Sun Aug 25 1991'
             description: 'Date this RPM was defined'
         - string:
             name: CHANGELOG_NAME

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 875b6c078b600ef557600fb25620751daaf2d369..b5368e75d6525361bf80603dfdf39aeb9ab5e042 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -11,6 +11,8 @@
     build-timeout: 360
     build-node: centos7-java-builder-2c-8g
 
+    email-recipients: 'jenkins@lists.opendaylight.org'
+
     # openstack-infra-parameters defaults
     archive-artifacts: ''
     branch: master

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 14d52fbef20ded8a98bd640b5649a6addee6d95a..985b7e62af3084337b114565d3e2f8e2bbb2945d 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -102,6 +102,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -164,6 +165,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -224,6 +226,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -267,6 +270,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -301,6 +305,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -360,6 +365,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -417,6 +423,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 873d5ce52bf54ddcc7affdc2b403340a2ce240ba..c7e397cba19c77f43cf059f134c7b6779b884315 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -245,7 +245,7 @@
     name: email-notification
     publishers:
         - email-ext:
-            recipients: 'jenkins@lists.opendaylight.org'
+            recipients: '{email-recipients}'
             reply-to: ''
             content-type: default
             subject: '{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index acae5f121af2efc7c70447d1d17bf5ed2cb66c6d..9904fa7b79fea124b0608c69afe17803bb41917c 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -55,6 +55,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -118,6 +119,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - maven-deploy:
             id: ''
@@ -220,6 +222,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - postbuildscript:
             builders:
@@ -296,6 +299,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '{email-upstream}'
         - findbugs
         - jacoco-report
@@ -405,6 +409,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - maven-deploy:
             id: ''
@@ -469,6 +474,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
         - findbugs
@@ -539,6 +545,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
         - findbugs
@@ -639,6 +646,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[autorelease] [{project-name}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -701,6 +709,7 @@
     publishers:
         - findbugs
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
         - opendaylight-infra-shiplogs:

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index a29d8df701d2a8b5849df8465602b07ad57fe401..f6605551b459c7187ee3468ee386fefd7ed40d99 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -55,6 +55,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -104,6 +105,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -183,6 +185,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -251,6 +254,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
@@ -346,6 +350,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 8b5b7cc126d514bcab4816d4a86a5c12b0a17b27..a01779c96d24af15b65ff91db3ddd6d25a4d03a4 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -87,4 +87,5 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[sfc]'