Merge "Configure tep-ip for genius auto tunnels"
authorJamo Luhrsen <jluhrsen@redhat.com>
Fri, 1 Dec 2017 16:34:21 +0000 (16:34 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 1 Dec 2017 16:34:21 +0000 (16:34 +0000)
109 files changed:
jjb/aaa/aaa.yaml
jjb/alto/alto.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/validate-autorelease-oxygen.yaml
jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel.yaml
jjb/coe/coe.yaml
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/daexim/daexim.yaml
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius.yaml
jjb/global-jjb
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/distribution/distribution.yaml
jjb/integration/integration-configure-clustering.sh
jjb/integration/integration-deploy-controller-run-test.sh
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/integration4-templates.yaml
jjb/integration/multipatch-distribution.sh
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp.yaml
jjb/lf-infra/lf-infra-jobs.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide.yaml
jjb/netvirt/netvirt-full-integration.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/scripts/opflex-build.sh
jjb/ovil/ovil.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-sonar.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/ansible.yaml
jjb/packaging/build-rpm-snap.sh
jjb/packaging/packaging.yaml
jjb/packaging/puppet.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-defaults.yaml
jjb/releng-macros.yaml
jjb/releng-templates-java.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/spectrometer/spectrometer-jobs.yaml
jjb/sxp/sxp.yaml
jjb/systemmetrics/systemmetrics.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin.yaml
jjb/verify-gpg-signatures.sh [deleted file]
jjb/vtn/vtn.yaml
jjb/yang-push/yang-push.yaml
jjb/yangide/yangide.yaml
jjb/yangtools/yangtools.yaml
packer/provision/baseline.sh

index 772189a6f725391774f9de2fe6c14e9f7468a227..5332034967d0a9259d07ac380a9c4c3b7810d0da 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: aaa-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'aaa'
     project-name: 'aaa'
index 59f4e5310987bd595910f09386bcf80bb54541d7..13c60f745c51aa4cb6b3f63f3068c81bbb3b32de 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: alto-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'alto'
     project-name: 'alto'
index e6c1183545c35365e2872a834f7a7530e297e7a0..aa3c6139d6ec1e6ff4733e3566014c08a87d180d 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: atrium-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'
index 0b4d4201ffc42e2ca7038eacfb975f73ffb78c87..6ec385a89e2b1fc38baa21c2f91e7bdc075bbbc9 100644 (file)
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**/*.xml'
index 89320ce6078e91abaf120141a20a44d4925fbd73..475780867d8404e9174e13c7fd294a2a070f13c0 100644 (file)
           project: neutron
       - nic:
           project: nic
-      - ocpplugin:
-          project: ocpplugin
       - of-config:
           project: of-config
       - openflowplugin:
           project: openflowplugin
       - ovsdb:
           project: ovsdb
+      - p4plugin:
+          project: p4plugin
       - packetcable:
           project: packetcable
       - sfc:
index 5af2e07282fa73a1c5f180a1ef5db0f6b9cb1be8..297a6aa99fb08a429eb6566a7c0000a77d2a5f2f 100644 (file)
@@ -28,6 +28,7 @@
     install-features: >
         odl-restconf,
         odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
         odl-bgpcep-data-change-counter,
         odl-netconf-topology
 
index 6d6190a2718b4607fe0a4cfda6de08c1f68cc814..765ffe8b1efb0e65f8053e6cca45ad088bd4e0ba 100644 (file)
@@ -29,6 +29,7 @@
     install-features: >
         odl-restconf,
         odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
         odl-bgpcep-data-change-counter,
         odl-netconf-topology
 
index baad20af43cc5b0829c07966899df5fb917a6376..04d7259a97c37251df9e2608e482c073f8ff4a17 100644 (file)
@@ -31,6 +31,7 @@
         odl-jolokia,
         odl-bgpcep-data-change-counter,
         odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
         odl-netconf-topology
 
     # Robot custom options:
index b87c972975b38eeef81fe0db1e4667df1015208c..8cf9a9682a5da815d717e6d60da8f66379f848dc 100644 (file)
           scope: 'only'
 
     # Features to install
-    install-features: 'odl-restconf,odl-bgpcep-bgp'
+    install-features: >
+        odl-restconf,
+        odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example
 
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
index d09bd4ce5f8bb2e7f5796b37fa108c649468ef2a..a6ea709fe5933adab1fb944a9fe11f830c285e31 100644 (file)
@@ -27,7 +27,8 @@
     # Features to install
     install-features: >
         odl-restconf-noauth,
-        odl-bgpcep-bgp
+        odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example
 
     # Built timeout
     build-timeout: '1500'
index cf2a2bbeb1a3f7e04146f428bef1ac7e1f8d3955..9f062b5bc61f1aeeac8c8624ece1fae36478fffa 100644 (file)
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf-noauth,odl-bgpcep-bgp,odl-netconf-clustered-topology'
+    install-features: >
+        odl-restconf-noauth,
+        odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
+        odl-netconf-clustered-topology
 
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
index 8f94c0174f8a3615cbf006f02eb2058cae13ac45..8c667baa3f2c7a7c742431e57fcd0a6068392c94 100644 (file)
@@ -32,7 +32,9 @@
         odl-restconf,
         odl-bgpcep-pcep,
         odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
         odl-bgpcep-bmp,
+        odl-bgpcep-bmp-config-example,
         odl-jolokia
 
     # Robot custom options
index e443cd392b97e31d762942d9056f90bccd635b4e..d74448505c63c1d94d34bb3a279b2f7c6a48f213 100644 (file)
@@ -20,7 +20,7 @@
           mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -54,7 +54,7 @@
           mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -89,7 +89,7 @@
           mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
 - project:
     name: bgpcep-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'bgpcep'
     project-name: 'bgpcep'
index 759a5564d37cbefca5dcac2d4b76ab05e9e28a89..4b9c3b86fcc1d51a59cd7be00655a519348554b6 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: bier-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'bier'
     project-name: 'bier'
index d2a4240e7665fc05010790b5bf301ad8ef96421c..9c87714fb8fbf8d59302f172a1b1a913fccd8954 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: capwap
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'capwap'
     project-name: 'capwap'
index e4a06da35d66c5aaccec0df0aea7fcf0c4d5ba5c..3880e23be198d844ec3cf8231b4e34bb7a61c762 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: cardinal-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'cardinal'
     project-name: 'cardinal'
index e9d0f32f9262c278d4fe182d7fa06867fe6707bd..14b9db0e9f1f1e403c1f8169d829f68a06117da2 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: centinel-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'centinel'
     project-name: 'centinel'
index eba49dffaa816d7d8fc32b41e8ff68e1d68af232..c83c050c38c414a417cc3e4411f4b70afdbba687 100644 (file)
@@ -83,7 +83,7 @@
 - project:
     name: coe-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'coe'
     project-name: 'coe'
index ba8a22f1b4859133c923186f22df971944a2cee9..c2524eaeca7d6f6a7e0c0777ce73fbae2a0a93e6 100644 (file)
@@ -85,7 +85,7 @@
 - project:
     name: controller-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'controller'
     project-name: 'controller'
index 19fa1e364766246976d186dbbff6a09c823d7cd0..5a300fe311f5dabcab5c4f197f72b86d3933edaf 100644 (file)
@@ -81,7 +81,7 @@
 - project:
     name: coretutorials-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'coretutorials'
     project-name: 'coretutorials'
index ba6c34e3c015b7d0e6157afc22f407e6dd3d3a68..2bd15c025b8434fb026c0148556c6587efcadd5c 100644 (file)
@@ -56,7 +56,7 @@
 - project:
     name: daexim-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'daexim'
     project-name: 'daexim'
index b3b7910e3cfb9e43ebad694008c829744181d27a..88a2f40c905037aad993ce43946bb46db27c34c2 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: didm-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'didm'
     project-name: 'didm'
     branch: 'master'
index 930a50c63a5a6ab02c69672fb3b9d523fba1b885..4bc0cff7457d42d7fb83fd31000d1daae7477c19 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: dlux-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'dlux'
     project-name: 'dlux'
     branch: 'master'
index b9cdd978b237a4fae076b4bc102dd0a9b51def06..486b12b1d40e658c005665e96b47a6e3fe3a2e98 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: dluxapps-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'dluxapps'
     project-name: 'dluxapps'
index d1912750069c13b937fc61baa3664f1c0600be4e..75a86b913f53681c11d8fb473bac7a962f8ed7f0 100644 (file)
@@ -87,7 +87,7 @@
 - project:
     name: eman-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'eman'
     project-name: 'eman'
     branch: 'master'
index 98c80bc87357e9155c311d2aa8dd63e0a42054be..73a5ef4693acc310dbf6607c601bd736b47cc985 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: faas-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
index afb245e5232b2b04acd03fccb42932625d662dce..50ce1bdf8c6d1170978dc2ee2614cb9be5678abe 100644 (file)
@@ -87,7 +87,7 @@
 - project:
     name: federation-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'federation'
     project-name: 'federation'
index 8fac19028ad1acc14403b6e95ebd0d017a7ec4b9..61703e5d7f390806f921360c8dc06cae63141545 100644 (file)
 - project:
     name: genius-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
index 055c992c99b92928f7bdd82ae96ed89cb790617d..4c47edee502585d83b3b1f52a3eb611083383a73 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 055c992c99b92928f7bdd82ae96ed89cb790617d
+Subproject commit 4c47edee502585d83b3b1f52a3eb611083383a73
index 4d42d19cd478f3093dad543717c667eec9c51d69..e258a3bf7297c54c111cd739cc7a5f161e1840f1 100644 (file)
@@ -32,8 +32,8 @@
 
     openstack:
       - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
 
     public-bridge: 'br-int'
 
index a89c03329bc64ee17874a73ceffa95e44f9f3b2a..e707693a201805088b10fd731e804bd05a0a74bc 100644 (file)
@@ -99,7 +99,7 @@
 - project:
     name: groupbasedpolicy-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
index 59a0c61460389b009d0bd4620ba21a62ce160135..43e0f2deffdc310c42b40917c99e4478e463e93c 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: vbd-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
index 8f4eb59fcf233b72f2786d438d00dc4da985dbbb..6c743bc372bf2059ca6ad66fa5f78ee3717dfe53 100644 (file)
@@ -85,7 +85,7 @@
 - project:
     name: infrautils-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
index d1771099eaae2678c6787592f23116e690934bc0..d9d9a76eb61c283f99e1374d0c5a7404e3e0e345 100644 (file)
@@ -35,7 +35,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -63,7 +63,7 @@
 
     publishers:
       - findbugs
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'integration/distribution'
           branch: '{branch}'
 
           id: ''
           unique-version: true
           deploy-unstable: false
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
index f4791ba5c6879454a1fcd9bca6f561e1316fc4bd..a4cb1b8f694dc264911b8b0b77468c3e61a8a7bd 100644 (file)
@@ -51,7 +51,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
index fbad4140664a4211e6079d2625d5557f176ab042..53d72fc8b9caf37880af39291ee140524dda0f57 100644 (file)
@@ -10,7 +10,6 @@
       - 'distribution-offline-{stream}'
       - 'distribution-check-{stream}'
       - gerrit-maven-clm
-      - gerrit-maven-sonar
       - gerrit-tox-verify
 
     project: integration/distribution
       - carbon:
           branch: stable/carbon
           karaf-version: karaf3
+
+- project:
+    name: distribution-sonar
+    jobs:
+      - gerrit-maven-sonar
+    project: integration/distribution
+    project-name: distribution
+    branch: master
+    mvn-settings: integration-distribution-settings
+    mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index c9ab8fe2d7cabe556fdef90e28df783dcf2abfd0..27a9d2447c103762d2e640d1e942378f0d665ffb 100644 (file)
@@ -12,6 +12,7 @@ echo "#################################################"
 AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
 MODULESCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/modules.conf
 MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf
+MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg
 FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
 CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
 LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
@@ -75,6 +76,10 @@ wget --progress=dot:mega  '${ACTUAL_BUNDLE_URL}'
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}
 
+echo "Adding external repositories..."
+sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF}
+cat ${MAVENCONF}
+
 echo "Configuring the startup features..."
 sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
 sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features%g" ${FEATURESCONF}
index 49ccb96256c0fbcfd2e6ddc6ae9e20bca06e0585..2daad05695b07cd0f82a7dcc7c808ffcb6886993 100644 (file)
@@ -5,6 +5,7 @@
 # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
 source ${ROBOT_VENV}/bin/activate
 
+MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg
 FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
 CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
 LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
@@ -54,6 +55,10 @@ wget --progress=dot:mega '${ACTUAL_BUNDLE_URL}'
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}
 
+echo "Adding external repositories..."
+sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF}
+cat ${MAVENCONF}
+
 echo "Configuring the startup features..."
 sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
 
index 6c3d7588aa301bd455dfd3feabebe6054a76d40b..4d331abd32f15dc9c71fef12054c5c56152f5fdc 100644 (file)
@@ -497,12 +497,10 @@ EOF
         scp ${!CONTROLLERIP}:/tmp/odl${i}_zrpcd.log.tar ${NODE_FOLDER}
         tar -xvf ${NODE_FOLDER}/odl${i}_karaf.log.tar -C ${NODE_FOLDER} --strip-components 2 --transform s/karaf/odl${i}_karaf/g
         grep "ROBOT MESSAGE\| ERROR " ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err.log
-        # Print ROBOT lines, Print Caused by...Exception: lines,
-        # Print Exception{ lines as well as the previous line that has the timestamp for context
-        sed -n -e '/ROBOT MESSAGE/P' -e '/Caused by.*Exception:/P' -e '$!N;/Exception:/P;D' -e '$!N;/Exception{/P;D' \
-            ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_exception.log
         grep "ROBOT MESSAGE\| ERROR \| WARN \|Exception" \
             ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err_warn_exception.log
+        # Print ROBOT lines and print Exception lines. For exception lines also print the previous line for context
+        sed -n -e '/ROBOT MESSAGE/P' -e '$!N;/Exception/P;D' ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_exception.log
         rm ${NODE_FOLDER}/odl${i}_karaf.log.tar
         mv karaf_${i}_threads* ${NODE_FOLDER}
         mv ${NODE_FOLDER} ${WORKSPACE}/archives/
@@ -677,6 +675,43 @@ function get_service () {
     set -e
 }
 
+# Check if rabbitmq is ready by looking for a pid in it's status.
+# The function returns the status of the grep command which callers can check.
+function is_rabbitmq_ready() {
+    local -r ip=$1
+    rm -f rabbit.txt
+    ${SSH} ${ip} "sudo rabbitmqctl status" > rabbit.txt
+    grep pid rabbit.txt
+}
+
+# retry the given command ($3) until success for a number of iterations ($1)
+# sleeping ($2) between tries.
+function retry() {
+    set +e
+    local -r -i max_tries=${1}
+    local -r -i sleep_time=${2}
+    local -r cmd=${3}
+    local -i retries=1
+    local -i rc=1
+    while true; do
+        echo "retry ${cmd}: attempt: ${retries}"
+        ${cmd}
+        rc=$?
+        if ((${rc} == 0)); then
+            break;
+        else
+            if ((${retries} == ${max_tries})); then
+                break
+            else
+                ((retries++))
+                sleep ${sleep_time}
+            fi
+        fi
+    done
+    set -e
+    return ${rc}
+}
+
 # if we are using the new netvirt impl, as determined by the feature name
 # odl-netvirt-openstack (note: old impl is odl-ovsdb-openstack) then we
 # want PROVIDER_MAPPINGS to be used -- this should be fixed if we want to support
@@ -834,9 +869,17 @@ done
 # AccessRefused: (0, 0): (403) ACCESS_REFUSED - Login was refused using authentication mechanism AMQPLAIN. For details see the broker logfile.
 # Compare that timestamp to this log in the control stack.log: sudo rabbitmqctl set_permissions -p nova_cell1 stackrabbit
 # If the n-cpu.log is earlier than the control stack.log timestamp then the failure condition is likely hit.
-# TODO: modify devstack to wait for rabbitmq to be available on the controller before starting nova-compute.
-echo "Sleeping for 360s to allow controller to create nova_cell1 before the computes need it"
-sleep 360
+
+echo "Wait a maximum of 30m until rabbitmq is ready to allow the controller to create nova_cell1 before the computes need it"
+retry 30 60 "is_rabbitmq_ready ${OPENSTACK_CONTROL_NODE_1_IP}"
+rc=$?
+if ((${rc} == 0)); then
+    echo "rabbitmq is ready, starting ${NUM_OPENSTACK_COMPUTE_NODES} compute(s)"
+else
+    echo "rabbitmq was not ready in "
+    collect_logs
+    exit 1
+fi
 
 for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
     NUM_COMPUTES_PER_SITE=$((NUM_OPENSTACK_COMPUTE_NODES / NUM_OPENSTACK_SITES))
@@ -1097,6 +1140,18 @@ cat testplan.txt
 # Use the testplan if specific SUITES are not defined.
 if [ -z "${SUITES}" ]; then
     SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
+else
+    newsuites=""
+    workpath="${WORKSPACE}/test/csit/suites"
+    for suite in ${SUITES}; do
+        fullsuite="${workpath}/${suite}"
+        if [ -z ${newsuites} ]; then
+            newsuites+=${fullsuite}
+        else
+            newsuites+=" "${fullsuite}
+        fi
+    done
+    SUITES=${newsuites}
 fi
 
 # TODO: run openrc on control node and then scrape the vars from it
@@ -1118,7 +1173,10 @@ source /tmp/os_netvirt_client_rc
 
 echo "Starting Robot test suites ${SUITES} ..."
 # please add pybot -v arguments on a single line and alphabetized
-pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+for suite in ${SUITES}; do
+    log_name_ext=$(basename ${suite} | cut -d. -f1)
+    pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+    --log log_${log_name_ext}.html --report None --output output_${log_name_ext}.xml \
     -v BUNDLEFOLDER:${BUNDLEFOLDER} \
     -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
     -v CONTROLLER_USER:${USER} \
@@ -1164,7 +1222,10 @@ pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${D
     -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} \
     -v USER_HOME:${HOME} \
     -v WORKSPACE:/tmp \
-    ${TESTOPTIONS} ${SUITES} || true
+    ${TESTOPTIONS} ${suite} || true
+done
+#rebot exit codes seem to be different
+rebot --output ${WORKSPACE}/output.xml --log None --report None output_*.xml || true
 
 echo "Examining the files in data/log and checking file size"
 ssh ${ODL_SYSTEM_IP} "ls -altr /tmp/${BUNDLEFOLDER}/data/log/"
index 00c2d8c9ee7946353a96912cb790508637cd7791..40f75ed4bdeda1c5eaec681e9d1b674e81828c9d 100644 (file)
@@ -95,7 +95,8 @@
           default: '{test-suites}'
           description: |
               List of space-separated suites. Useful when running specific suites within a testplan.
-              (ex. integration/test/csit/suites/openstack/connectivity/01_l2_tests.robot
+              Do not include ${{WORKSPACE}}/test/csit/suites/ in the values:
+              (ex. openstack/connectivity/l2.robot openstack/tempest/tempest.robot
               integration/test/csit/suites/netvirt/ElanService/).
 
 - parameter:
 # in order to prevent Jenkins from starting only a subset and still voting Verified+1.
 # Contrary to gerrit-trigger-patch-submitted, this votes +1 also on unstable runs.
 # Arguments:
-#     server: name of gerrit server to listen to
+#     gerrit-server-name: name of gerrit server to listen to
 #     project: pattern to match triggering projects
 #     branch: triggering branch name
 #     files: pattern to match triggering filepaths
     name: integration-trigger-patch-submitted
     triggers:
       - gerrit:
-          server-name: '{server}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
index 4d83eb20d626a003a2fc588f1cae4acba7c73907..21fc2be3e9924ae53ffb2bbff0bce74d2c0c6838 100644 (file)
@@ -2,12 +2,16 @@
 # Job templates in this file (please update with every new template):
 # FIXME: Update
 #
-# {project}-csit-verify-1node-{functionality}
 # {project}-csit-1node-{functionality}-{install}-{stream}
 # {project}-csit-1node-periodic-{functionality}-{install}-{stream}
-# {project}-csit-verify-3node-{functionality}
+# {project}-csit-3node-docker-{functionality}-{install}-{stream}
 # {project}-csit-3node-{functionality}-{install}-{stream}
 # {project}-csit-3node-periodic-{functionality}-{install}-{stream}
+# {project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}
+# {project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}
+# {project}-csit-verify-1node-{functionality}
+# {project}-csit-verify-3node-{functionality}
+# {project}-patch-test-{feature}-{stream}
 #
 # Parameters:
 # FIXME: Distinguish variables, macros and arguments, then update.
@@ -31,7 +35,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -77,7 +81,7 @@
 
     triggers:
       - integration-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: 'integration/test'
           branch: 'master'
           files: 'csit/suites/{project}/**'
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
 
     triggers:
       - integration-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: 'integration/test'
           branch: 'master'
           files: 'csit/suites/{project}/**'
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
     concurrent: true
 
     properties:
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
     concurrent: true
 
     properties:
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'test-{project}-all'
index cca3d2bee69a887ff98f87245f8aff872aa62efe..da480d043578302c1e7eba7a3e78a2b1595a3de4 100644 (file)
@@ -54,7 +54,7 @@
     name: 'integration-distribution-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -89,7 +89,7 @@
     name: 'integration-sanity-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'test-integration'
       - opendaylight-infra-wrappers:
           build-timeout: '1200'
 
+    triggers:
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'multipatch-build:'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '**'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+
     builders:
       - wipe-org-opendaylight-repo
       - integration-multipatch-builder
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
     name: 'integration-distribution-high-frequency-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
index 22e61a94ca19d5716df0170eeca10cdca1269bda..fd3d923d15f88e0c20796abd01df335acd0acae4 100644 (file)
@@ -8,7 +8,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
index fde2a3dde4138f26bb04a33302c9c6a78d58738c..f5711aedd1090be38e1b8c63f3cef553ad9e8c58 100644 (file)
@@ -30,6 +30,10 @@ export EMAIL="sandbox@jenkins.opendaylight.org"
 export GIT_COMMITTER_NAME="Multipatch Job"
 
 # TODO: Is "patches" still the correct word?
+if [ -n "$GERRIT_EVENT_COMMENT_TEXT" ]; then
+    PATCHES_TO_BUILD=$(echo "$GERRIT_EVENT_COMMENT_TEXT" \
+        | grep 'multipatch-build:' | awk -F: '{print $2}')
+fi
 IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}"
 
 # For each patch:
index 30ecd8b5528d5a104b28bf21fa373a338d8b96ea..088ec87578099b7a1f78cd87fa4c7bb4f59e97ee 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: iotdm-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
index a7138120710fe18c667cacf3094211269cd67812..28e7f4faea8f6bfd0e8794c9c6d15cbf863adcd6 100644 (file)
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
           karaf-version: karaf3
index 87d4d3337235ac550809965fea8935d243a3f1b6..387b10b4a35b3645cfa75937a99ca65552cb4f90 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: jsonrpc-fluorine
+    jobs:
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
+
+    project: 'jsonrpc'
+    project-name: 'jsonrpc'
+    stream: fluorine
+    branch: 'master'
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'jsonrpc-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
+    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-oxygen
     jobs:
@@ -9,7 +35,7 @@
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: oxygen
-    branch: 'master'
+    branch: 'stable/oxygen'
     jdks:
       - openjdk8
     maven:
 - project:
     name: jsonrpc-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
index 147264acd62b3da6459ccc7602a17c3c5bc38f06..0b6745a59e4d197760367da0358525736359517d 100644 (file)
@@ -99,7 +99,7 @@
 - project:
     name: l2switch-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
index 1c136a5a3fbcc9757b57483a39695aaed81c598d..bb78959543172bc573bcabc6abd98aac0dc40494 100644 (file)
@@ -84,7 +84,7 @@
 - project:
     name: lacp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'
index 94384bd04d8cf1da5d2c427f11b99c62bbf1030a..1ca3120834ef9be3fff38c8fa7dbb9aa1507a369 100644 (file)
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: LinuxFoundation
 
+- project:
+    name: lf-infra-docs-conf
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-docs-conf
+    project: releng/docs-conf
+    project-pattern: releng/docs-conf
+    build-node: centos7-java-builder-2c-4g
+    stream: any
+    branch: '*'
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: LinuxFoundation
+
 - project:
     name: lf-infra-global-jjb
     jobs:
index 4fbb5fa54772ba35e83bd46bdd17f1c7845ef2ca..13abf4e69fde6de38411a63f0558e34e04d0f2da 100644 (file)
@@ -90,7 +90,7 @@
 - project:
     name: lispflowmapping-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
index 5da35e7d01438e2bbc9e2c17b9a8668f8f0b70f9..9e10a68fc23d7270c0f24332cd23e8eb65876956 100644 (file)
@@ -2,13 +2,11 @@
 - project:
     name: mdsal-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
+      - '{project-name}-merge-{stream}'
 
     stream: oxygen
     project: 'mdsal'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a674173c7b29d
+
 - project:
     name: mdsal-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'mdsal'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a674173c7b29d
+
 - project:
     name: mdsal-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'mdsal'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a674173c7b29d
+
 - project:
     name: mdsal-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
index 95a1ac9b66c2eb4c3d12a0148d7e3725e477d106..c758d82ecad8ea312e815984c85c0510e65b143d 100644 (file)
@@ -2,11 +2,11 @@
 - project:
     name: messaging4transport-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'messaging4transport'
     email-upstream: '[messaging4transport]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a677283157db4
+
 - project:
     name: messaging4transport-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'messaging4transport'
     email-upstream: '[messaging4transport]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a677283157db4
+
 - project:
     name: messaging4transport-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'messaging4transport'
     email-upstream: '[messaging4transport]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a677283157db4
+
 - project:
     name: messaging4transport-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'master'
index f08601eb8a74f128e5160e29ae5037ed2bbeb9ce..956eea3d5d13bccee8ed78e0d7942f8743ae8e98 100644 (file)
@@ -2,11 +2,11 @@
 - project:
     name: natapp-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'natapp'
     email-upstream: '[natapp] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a679c0f4f08a8
+
 - project:
     name: natapp-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'natapp'
     email-upstream: '[natapp] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a679c0f4f08a8
+
 - project:
     name: natapp-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'natapp'
     email-upstream: '[natapp] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a679c0f4f08a8
+
 - project:
     name: natapp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'natapp'
     project-name: 'natapp'
     branch: 'master'
index ef1b6c17ec23297e9661ebb7509f8e46d234371a..0874bb36dd651fbb0996ac4f01dca4d396cc8a10 100644 (file)
@@ -2,12 +2,10 @@
 - project:
     name: nemo-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'nemo'
     email-upstream: '[nemo]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67a9890f6202
+
 - project:
     name: nemo-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'nemo'
     email-upstream: '[nemo]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67a9890f6202
+
 - project:
     name: nemo-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'nemo'
     email-upstream: '[nemo]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67a9890f6202
+
 - project:
     name: nemo-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
index a3379305a6bdaf809401b9590d11372366575d05..a2cce08ed8e01b2f538602aacdf44aae07404965 100644 (file)
@@ -2,12 +2,10 @@
 - project:
     name: netconf-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'netconf'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
 - project:
     name: netconf-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'netconf'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
 - project:
     name: netconf-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'netconf'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
 - project:
     name: netconf-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
index eaed56d4a8fc06f8692059c27731254d76ff8956..372efdf93a53b3873e20a8a5232566f6dcca2ae6 100644 (file)
@@ -2,11 +2,10 @@
 - project:
     name: netide-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'netide'
     email-upstream: '[netide] [openflowjava]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67bab3755815
+
 - project:
     name: netide-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'netide'
     email-upstream: '[netide] [openflowjava]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67bab3755815
+
 - project:
     name: netide-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'netide'
     email-upstream: '[netide] [openflowjava]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67bab3755815
+
 - project:
     name: netide-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netide'
     project-name: 'netide'
     branch: 'master'
index f3e2446a303fabe6ec88b0d2d8c543c2b6b5c314..c81a46d14baaeb865b28ee19fc84c53391981a26 100644 (file)
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'runit'
index b6a3503248f824f88d382ab4012c85537077b618..e4b323e677a3ae41ac8b4641646b0bd550b40b80 100644 (file)
@@ -41,6 +41,9 @@
       - snat-conntrack:
           csit-list: >
               netvirt-csit-1node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
+      - cluster-snat-conntrack:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream}
       - l2gw:
           csit-list: >
               netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
index 744fb6a8450fd6428547ec75cc16f0257a90d1dd..217f441964a9ad8fb125157c88cacbf4f162ab8e 100644 (file)
@@ -2,13 +2,11 @@
 - project:
     name: netvirt
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
+      - '{project-name}-merge-{stream}'
       - gerrit-tox-verify
 
     stream:
     email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67da0ffbb1ba
+
 - project:
     name: netvirt-vpp
     jobs:
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify
 
     stream: vpp
     project: 'netvirt'
@@ -65,7 +66,7 @@
 - project:
     name: netvirt-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'
index 855b2bdc413ebbc397a448b8090cea1bf24a889c..6e421f2f611fb41da6897892a05a2853c484bd39 100644 (file)
@@ -2,13 +2,11 @@
 - project:
     name: neutron-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'neutron'
     email-upstream: '[neutron] [odlparent] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
 - project:
     name: neutron-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'neutron'
     email-upstream: '[neutron] [odlparent] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
 - project:
     name: neutron-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'neutron'
     email-upstream: '[neutron] [odlparent] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
 - project:
     name: neutron-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'neutron'
     project-name: 'neutron'
     branch: 'master'
index bab60f9f38bf8777c5a1a35b744e435d66a3a457..f41693c9f171f8b5a66133e2f8528c0f6c17d52c 100644 (file)
@@ -2,11 +2,10 @@
 - project:
     name: next-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'next'
     email-upstream: '[next]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67e7c516f385
+
 - project:
     name: next-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'next'
     email-upstream: '[next]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67e7c516f385
+
 - project:
     name: next-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'next'
     email-upstream: '[next]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67e7c516f385
+
 - project:
     name: next-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'next'
     project-name: 'next'
     branch: 'master'
index 0573c3760f86c2875cdd6ef3097bc44a691747d4..593f72cb917b4d51ce1a7754516c6fe4030d9322 100644 (file)
@@ -2,12 +2,10 @@
 - project:
     name: nic-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'nic'
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
 - project:
     name: nic-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'nic'
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
 - project:
     name: nic-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'nic'
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
 - project:
     name: nic-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
index 48fd9b1491f14e3d556b2f4ffc2b149442820227..56e4e296999c4469c846959239c39c5555e21b41 100644 (file)
@@ -2,12 +2,10 @@
 - project:
     name: ocpplugin-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'ocpplugin'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a687673279f9c
+
 - project:
     name: ocpplugin-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'ocpplugin'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a687673279f9c
+
 - project:
     name: ocpplugin-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'ocpplugin'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a687673279f9c
+
 - project:
     name: ocpplugin-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'master'
index b4bb2773f9e7bdca18e7f2089ba6b2db0fdc495c..5f7b0119a30adca7afb38a823adae35261022c21 100644 (file)
 
     dependencies: ''
     email-upstream: '[odlparent]'
-    archive-artifacts: ''
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
 
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
     dependencies: ''
     email-upstream: '[odlparent]'
-    archive-artifacts: ''
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
 
     # Used by the release job
     javadoc-path: org.opendaylight.$PROJECT/$STREAM
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[odlparent]'
-    archive-artifacts: ''
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
 
     # Used by the release job
     javadoc-path: org.opendaylight.$PROJECT/$STREAM
 - project:
     name: odlparent-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'odlparent'
     project-name: 'odlparent'
index 7eaa59e773b7832bcf63308dcdc8f21695f09780..cce3332fc99ffb78a3ec48dbd5946545df4c2d4a 100644 (file)
@@ -2,12 +2,10 @@
 - project:
     name: of-config-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'of-config'
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'of-config'
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'of-config'
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
index 4a56593fe4ba0d1277e633486bd53e33eafbdb28..68b6c8c1aba36c37f02cea055bed449addb33194 100644 (file)
@@ -2,10 +2,9 @@
 - project:
     name: circuitsw-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'ofextensions/circuitsw'
     email-upstream: '[circuitsw]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68970cf5b25c
+
 - project:
     name: circuitsw-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'ofextensions/circuitsw'
     email-upstream: '[circuitsw]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68970cf5b25c
+
 - project:
     name: circuitsw-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'ofextensions/circuitsw'
     email-upstream: '[circuitsw]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68970cf5b25c
+
 - project:
     name: circuitsw-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'
index ca929de57f70f8f7938c27ec518450b3b153be88..77165377681e2d20d0004db4946a826fd37528e6 100644 (file)
@@ -2,12 +2,11 @@
 - project:
     name: openflowjava-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-merge-{stream}'
 
     stream: nitrogen
     project: 'openflowjava'
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68a1507dae22
+
 - project:
     name: openflowjava-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'openflowjava'
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68a1507dae22
+
 - project:
     name: openflowjava-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'master'
index 1425bd90243d2b37ce0cd63867a4a1974acf2186..94ca35465cf7df772f05049b2c47443768ac5a30 100644 (file)
           scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-table-miss-enforcer'
+    install-features: >
+        odl-openflowplugin-flow-services-rest,
+        odl-openflowplugin-app-table-miss-enforcer,
+        odl-openflowplugin-nxm-extensions
 
     # Robot custom options
     robot-options: '-v SWITCHES:3'
index 0d720a5e675934ba8a639bbf75db5e8d4be01dff..e2f8167e5dc1096944738340b7ed3752e3d39664 100644 (file)
@@ -2,13 +2,11 @@
 - project:
     name: openflowplugin-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
+      - '{project-name}-merge-{stream}'
 
     stream: oxygen
     project: 'openflowplugin'
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
     archive-artifacts: 'model/*/target/site/**'
 
+    # Used by the release job
+    staging-profile-id: a68a76dc1b44c
+
 - project:
     name: openflowplugin-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'openflowplugin'
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
     archive-artifacts: 'model/*/target/site/**'
 
+    # Used by the release job
+    staging-profile-id: a68a76dc1b44c
+
 - project:
     name: openflowplugin-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'openflowplugin'
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
     archive-artifacts: 'model/*/target/site/**'
 
+    # Used by the release job
+    staging-profile-id: a68a76dc1b44c
+
 - project:
     name: openflowplugin-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
index 7a228a46ce00092c35cb7a5b77faa20e88b73398..ffa23c14a1a4f2fc1bf08dd7736ae409e3af722c 100644 (file)
@@ -72,7 +72,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'opflex'
           branch: '{branch}'
 
index ed202bff8c00df7d47ea02629da053aaf3e44ea3..ca5a8bf0be8cfc90fecf9e2477fb142f772bb271 100644 (file)
@@ -50,7 +50,7 @@ pushd libopflex
     --with-buildversion=$BUILD_NUMBER \
     CPPFLAGS="-isystem $ROOT/include" \
     CXXFLAGS="-Wall"
-make -j8
+make -j4
 if ! make check; then find . -name test-suite.log -exec cat {} \; && false; fi
 make install
 make dist
@@ -77,7 +77,7 @@ pushd agent-ovs
     --with-buildversion=$BUILD_NUMBER \
     CPPFLAGS="-isystem $ROOT/include" \
     CXXFLAGS="-Wall"
-make -j8
+make -j4
 if ! make check; then find . -name test-suite.log -exec cat {} \; && false; fi
 make dist
 mv *.tar.gz "$UPLOAD_FILES_PATH"
index 1ce01adec0ba1d9b3ec8063022335c4a5922e68f..57b3457a5a7ff56478188de70fa2ee75f4a0d047 100644 (file)
@@ -26,7 +26,7 @@
 - project:
     name: ovil-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'ovil'
     project-name: 'ovil'
     branch: 'master'
index ad0238ba4698e7c922ceebcbdeb868c4e6cce195..affbfaf976480f84e3a56d999c74a64b2f8de51d 100644 (file)
     triggers:
       - timed: '@midnight'
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'runit'
index fd529707c7b52e64430437fa8c848f987994d528..6f578accd3dbd1acdf4702e08db6284e6ce4451d 100644 (file)
@@ -38,7 +38,7 @@
     triggers:
       - timed: '{schedule-saturday}'
       - gerrit-trigger-patch-sonar:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'ovsdb'
 
     builders:
@@ -97,5 +97,5 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[ovsdb]'
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
index 0cdae53de81de2e83c857d11ebb6332d166baf34..79c14e3504ec321644e25a14cac8bfc57b6cd2fe 100644 (file)
@@ -2,13 +2,11 @@
 - project:
     name: ovsdb-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
+      - '{project-name}-merge-{stream}'
 
     stream: oxygen
     project: 'ovsdb'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68b188166958
+
 - project:
     name: ovsdb-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'ovsdb'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68b188166958
+
 - project:
     name: ovsdb-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'ovsdb'
@@ -76,3 +80,6 @@
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a68b188166958
index 50fedfac1931ce325c8de8af6b9bf675ca5f337c..e7e89ea6a75dfc307bbe7058893a031525be0604 100644 (file)
@@ -2,12 +2,11 @@
 - project:
     name: p4plugin-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'p4plugin'
     email-upstream: '[p4plugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68bf26e208d4
+
 - project:
     name: p4plugin-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'p4plugin'
     project-name: 'p4plugin'
index f35433745b02e0899e12731332ec77f0807dfeb1..dcf221405e6bb85dec5aaf3abe7a261db730fc9b 100644 (file)
@@ -49,7 +49,7 @@
     triggers:
       - timed: '@daily'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -92,7 +92,7 @@
     triggers:
       - timed: '@daily'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
index 9843af94509d10d2fffcc60f367c54d7b56424e3..5d2b55c21a4bc74753a66fe06a9475776ed117b8 100644 (file)
@@ -14,12 +14,6 @@ PYTHON="rpm_build/bin/python"
 $PYTHON -m pip install --upgrade pip
 $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 
-# If STREAM not passed, extract from job name (format: foo-job-name-<stream>)
-if [ -z "$STREAM" ]; then
-  # shellcheck disable=SC1083
-  STREAM=${{JOB_NAME##*-}}
-fi
-
 # Convert stream to numeric ODL major version
 if [ "$STREAM" == "carbon" ]; then
   VERSION_MAJOR=6
index cab68c051d10cf03d2ecf0719df0bcf19ced1e0d..e9d49f02b8cb5e147b773f3e320bb42a7d4e6b99 100644 (file)
           build-timeout: '{build-timeout}'
 
     builders:
+      - inject:
+          properties-content: 'STREAM={stream}'
       - shell: !include-raw: build-rpm-snap.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
       # Test Oxygen pre-release autorelease tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2011/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
       - shell: !include-raw: build-rpm.sh
 
       # Test Oxygen multipatch zip (no parallel tarball available)
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20171030.111310-56.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20171128.175421-68.zip'
       - shell: !include-raw: build-rpm.sh
 
       # Test latest Oxygen snapshot
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
       # Test Carbon multipatch zip (no parallel tarball available)
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20171027.223207-3.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20171128.221258-1.zip'
       - shell: !include-raw: build-rpm.sh
 
       # Test latest Carbon snapshot
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz'
       - shell: !include-raw: build-rpm.sh
 
+      # Test Nitrogen SR1 tarball
+      - inject:
+          # yamllint disable-line rule:line-length
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.1/karaf-0.7.1.tar.gz'
+      - shell: !include-raw: build-rpm.sh
+
       # Test Nitrogen multipatch zip (no parallel tarball available)
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.1-SNAPSHOT/karaf-0.7.1-20171027.044826-22.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.2-SNAPSHOT/karaf-0.7.2-20171128.223150-2.zip'
       - shell: !include-raw: build-rpm.sh
 
       # Test latest Nitrogen snapshot
       # Test Oxygen pre-release autorelease tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2011/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
       - shell: !include-raw: build-rpm.sh
 
       # Test Oxygen multipatch zip (no parallel tarball available)
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20171030.111310-56.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20171128.175421-68.zip'
       - shell: !include-raw: build-rpm.sh
 
       # Test latest Oxygen snapshot
     triggers:
       - timed: '@daily'
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'verify-rpm-full'
       - string:
           name: URL
           # yamllint disable-line rule:line-length
-          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-60-release.repo'
+          default: 'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-testing.repo'
           description: 'Link to .repo or .rpm file'
 
     scm:
index bdb56aaaa5fc106f21154784c409a5c4b06052fd..fa1eeb7eb1e42a850526a9f7c18f07b94ad2241d 100644 (file)
@@ -57,7 +57,7 @@
     triggers:
       - timed: '@weekly'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
     triggers:
       - timed: '@daily'
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'puppet-test-full'
index 2f5b98d6ad1e75c57b3607c5cd56824b467c8d88..9022c073abbf6ff1bfbc8cc8c15da2c5591c7ec4 100644 (file)
@@ -2,12 +2,10 @@
 - project:
     name: packetcable-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'packetcable'
     email-upstream: '[packetcable]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68ca4a24655c
+
 - project:
     name: packetcable-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'packetcable'
     email-upstream: '[packetcable]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68ca4a24655c
+
 - project:
     name: packetcable-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'packetcable'
     email-upstream: '[packetcable]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68ca4a24655c
+
 - project:
     name: packetcable-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
index 2afdd2a72b9fbf490c6bd7c27b6d52f283effa93..55411c36c67be86b1a264f9fe7315b144ce983db 100644 (file)
@@ -2,10 +2,9 @@
 - project:
     name: persistence-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'persistence'
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d3c2bb44d1
+
 - project:
     name: persistence-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'persistence'
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d3c2bb44d1
+
 - project:
     name: persistence-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'persistence'
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d3c2bb44d1
+
 - project:
     name: persistence-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'persistence'
     project-name: 'persistence'
     branch: 'master'
index 4206016aafed8399b0340c2ec658373c12a03dd1..1fa078c85f12b1854c5bff4233ffabf1a1b1edab 100644 (file)
@@ -25,8 +25,6 @@
     # lf-infra defaults
     jenkins-ssh-credential: opendaylight-jenkins-ssh
     gerrit-server-name: OpenDaylight
-    # server-name is deprecated, use gerrit-server-name moving forward.
-    server-name: 'OpenDaylight'
     mvn-site-id: opendaylight-site
     mvn-staging-id: opendaylight-staging
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
@@ -73,7 +71,7 @@
     docker_system_image: CentOS 7 - docker - 20171016-0023
     odl_system_count: 1
     odl_system_flavor: 4 GB General Purpose v1
-    odl_system_image: CentOS 7 - java-builder - 20171020-0130
+    odl_system_image: CentOS 7 - java-builder - 20171030-1039
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
     openstack_system_image: CentOS 7 - devstack - 20171014-2147
index 485a4ec3d24bf092f5819f04f7c7600eea31190c..1d35880b91a592d82260aee52692844e419fc6f5 100644 (file)
 # Only 'recheck' trigger word is supported, it always triggers the full set of relevant jobs,
 # in order to prevent Jenkins from starting only a subset and still voting Verified+1.
 # Arguments:
-#     server: name of gerrit server to listen to
+#     gerrit-server-name: name of gerrit server to listen to
 #     project: pattern to match triggering projects
 #     branch: triggering branch name
 #     files: pattern to match triggering filepaths
     name: gerrit-trigger-patch-submitted
     triggers:
       - gerrit:
-          server-name: '{server}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
     name: gerrit-trigger-patch-merged
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - change-merged-event
             - comment-added-contains-event:
     name: gerrit-trigger-patch-sonar
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'run-sonar'
           send-to:
             - recipients
 
-- publisher:
-    name: jacoco-report
-    publishers:
-      - jacoco:
-          exec-pattern: "**/**.exec"
-          class-pattern: "**/classes"
-          source-pattern: "**/src/main/java"
-          exclusion-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**"
-          status-update: true
-          targets:
-            - branch:
-                healthy: 10
-                unhealthy: 20
-            - method:
-                healthy: 50
-                unhealthy: 40
-
 - builder:
     # Deploys a maven site to Nexus using lftools nexus-zip command
     name: opendaylight-infra-deploy-maven-site
       - openstack:
           single-use: true
 
-- builder:
-    # TODO: Verify signature after downloading users public key from a locally created
-    # repository instead of the public keymesh. This requires a process in place to get ODL
-    # developers public keys into a local repository without increasing the job thoughput.
-    name: verify-gpg-signature
-    builders:
-      - shell: !include-raw: verify-gpg-signatures.sh
-
-- builder:
-    name: opendaylight-infra-jjbini
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'jjbini'
-              target: '$HOME/.config/jenkins_jobs/jenkins_jobs.ini'
-
 - publisher:
     name: opendaylight-infra-generate-csit-status-report
     publishers:
index a0efd78a99c39b7970a83ac4d1c10e8381fe4ce2..f64aa99f3329622874585309262f15ca8336cb03 100644 (file)
@@ -1,69 +1,4 @@
 ---
-- job-template:
-    # Template used for running CLM scans
-    # Arguements:
-    #   {name}         - Project Shortname
-    #   {project}      - Fully qualified project name
-    #   {mvn-settings} - Project maven settings file
-    #   {stream}
-    #   {jdk}
-    name: '{project-name}-clm-{stream}'
-
-    project-type: freestyle
-    node: '{build-node}'
-    jdk: '{jdk}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - git-scm:
-          refspec: ''
-          branch: '{branch}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - timed: '{schedule-saturday}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: 'mvn33'
-          pom: 'pom.xml'
-          goals: |
-              clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index
-              -Pq
-              {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=512m'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
-      - check-clm:
-          application-name: '{project-name}'
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - lf-infra-publish
-
 - job-template:
     name: '{project-name}-integration-{stream}'
 
           email-recipients: '{email-recipients}'
           email-prefix: '{email-upstream}'
       - findbugs
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
 
 - job-template:
     triggers:
       - timed: 'H H * * 0'
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: '{project}'
           branch: '{branch}'
 
           id: ''
           unique-version: true
           deploy-unstable: false
-      - jacoco-report
+      - lf-jacoco-report
       - lf-infra-publish
       - trigger:
           project: 'distribution-merge-{stream}'
           threshold: SUCCESS
-
-- job-template:
-    name: '{project-name}-sonar'
-    disabled: false
-
-    project-type: freestyle
-    node: '{build-node}'
-    jdk: 'openjdk8'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - git-scm:
-          refspec: ''
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - timed: '{schedule-saturday}'
-      - gerrit-trigger-patch-sonar:
-          server-name: '{server-name}'
-          name: '{project}'
-          # FIXME: Make sure this does not alter Gerrit votes, then update docs.
-
-    builders:
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: 'mvn33'
-          goals: |
-              {mvn-goals}
-              -Dsonar
-              {opendaylight-infra-mvn-opts}
-          maven-opts:
-            - '{mvn-opts}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - maven-target:
-          maven-version: 'mvn33'
-          # We should switch to the recommended configuration of sonar once
-          # JJB adds support for configurating the Sonar wrapper:
-          #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
-          goals: |
-              sonar:sonar
-              -Dsonar
-              -Dsonar.host.url=https://sonar.opendaylight.org
-              {opendaylight-infra-mvn-opts}
-          maven-opts:
-            - '{mvn-opts}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - jacoco-report
-      - findbugs
-      - lf-infra-publish
-
-- job-template:
-    name: '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-    jdk: '{jdks}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{mvn-version}'
-          goals: |
-              {mvn-goals}
-              -Dstream={stream}
-              {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '{mvn-opts}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - findbugs
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - jacoco-report
-      - lf-infra-publish
index c9a2bb4399f3a2a16b85253fd33e2f30534e6b9e..2269a92f0254a3e6b9f8ead615f9333baae7d5b2 100644 (file)
@@ -2,10 +2,9 @@
 - project:
     name: reservation-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'reservation'
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d9bc504037
+
 - project:
     name: reservation-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'reservation'
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d9bc504037
+
 - project:
     name: reservation-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'reservation'
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d9bc504037
+
 - project:
     name: reservation-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'reservation'
     project-name: 'reservation'
     branch: 'master'
index 0329c730f6c282e77954587d23dc0e39329e730d..72cada2990e99474615f19f41e12f02eb51fc5f8 100644 (file)
@@ -2,11 +2,10 @@
 - project:
     name: sdninterfaceapp-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'sdninterfaceapp'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68e3d1ff55e3
+
 - project:
     name: sdninterfaceapp-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'sdninterfaceapp'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68e3d1ff55e3
+
 - project:
     name: sdninterfaceapp-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'sdninterfaceapp'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68e3d1ff55e3
+
 - project:
     name: sdninterfaceapp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'
index c69711e8c5352b9bd64d59c65d984251cb4bab17..60bbb303757436a8cc7fc0c51ad2eceb496483c8 100644 (file)
@@ -44,7 +44,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: 'sfc-py/**'
index 660bb8b069bead147452d2d0f62f7a64b32cb5ba..564a8861d8e4e3c11df8aee89bc5ee42e7f5aa6b 100644 (file)
@@ -2,13 +2,10 @@
 - project:
     name: sfc-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'sfc'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68eb361ca48a
+
 - project:
     name: sfc-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'sfc'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68eb361ca48a
+
 - project:
     name: sfc-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'sfc'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68eb361ca48a
+
 - project:
     name: sfc-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
index 3472a372ae48eb0f87b2795e009636805c1e29d7..2096cfc70b85cbe08bf767eb225e260865e49cd3 100644 (file)
@@ -2,11 +2,10 @@
 - project:
     name: snbi-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'snbi'
     email-upstream: '[snbi]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68f328cefed6
+
 - project:
     name: snbi-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'snbi'
     email-upstream: '[snbi]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68f328cefed6
+
 - project:
     name: snbi-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'snbi'
     email-upstream: '[snbi]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68f328cefed6
+
 - project:
     name: snbi-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'snbi'
     project-name: 'snbi'
     branch: 'master'
index 2b411425909a6de6e87cc1a9e74561f16f214723..a9830adeae3857119a87fec7a480f164a76329a9 100644 (file)
@@ -2,12 +2,10 @@
 - project:
     name: snmp-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'snmp'
     email-upstream: '[snmp] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68fb236b93a6
+
 - project:
     name: snmp-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'snmp'
     email-upstream: '[snmp] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68fb236b93a6
+
 - project:
     name: snmp-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'snmp'
     email-upstream: '[snmp] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68fb236b93a6
+
 - project:
     name: snmp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
index 3907ef1957951e020200d66b095885329701db3b..aa880ef3fa89d42336c559caadd5d41744c29123 100644 (file)
@@ -2,12 +2,10 @@
 - project:
     name: snmp4sdn-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'snmp4sdn'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
+
 - project:
     name: snmp4sdn-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'snmp4sdn'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
+
 - project:
     name: snmp4sdn-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'snmp4sdn'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
+
 - project:
     name: snmp4sdn-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
index 752779e5f769450783d35bd0fd5b13b4fb4c3cdb..6291f9490baf917612a785dbb61d87c1a76acae2 100644 (file)
@@ -39,7 +39,7 @@
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: 'spectrometer'
           branch: 'master'
       - timed: '@daily'
index 41729186d70f5ad7a36823718655c944d32e4173..15da7544c9ccdf245fa728fdc4ce07b45b54ca7c 100644 (file)
@@ -2,12 +2,10 @@
 - project:
     name: sxp-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'sxp'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
 - project:
     name: sxp-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'sxp'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
 - project:
     name: sxp-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'sxp'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
 - project:
     name: sxp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
index 03d5fa7768f3c28fd3e12eadc7b6fc1dd28d44d6..1605e66b180f760306d0fa7661db2fae4a4c94ae 100644 (file)
@@ -2,10 +2,9 @@
 - project:
     name: systemmetrics-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69113575458e
+
 - project:
     name: systemmetrics-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69113575458e
+
 - project:
     name: systemmetrics-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69113575458e
+
 - project:
     name: systemmetrics-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
index d9381311d5d64d78189db072e7ea2effa9b4396c..5657e668abe2f3cf7005be4f2f72a17877160a88 100644 (file)
@@ -2,11 +2,10 @@
 - project:
     name: topoprocessing-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'topoprocessing'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a691bbe2328cb
+
 - project:
     name: topoprocessing-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'topoprocessing'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a691bbe2328cb
+
 - project:
     name: topoprocessing-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'topoprocessing'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a691bbe2328cb
+
 - project:
     name: topoprocessing-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'
index d424f796150c5693561a3dab64a2f7f5d76ea086..e45a8640653810be66134d7ddc3d06d3ed0ad0a2 100644 (file)
@@ -2,10 +2,9 @@
 - project:
     name: transportpce-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'transportpce'
     project-name: 'transportpce'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6927323fa3d4
+
 - project:
     name: transportpce-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'transportpce'
     project-name: 'transportpce'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6927323fa3d4
+
 - project:
     name: transportpce-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'transportpce'
     project-name: 'transportpce'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6927323fa3d4
+
 - project:
     name: transportpce-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'transportpce'
     project-name: 'transportpce'
index 9ccf6eb5eab48ec5513fdf82552376636be8abbd..24b551014c1911f76252c3b2e248940d66dffcca 100644 (file)
@@ -2,11 +2,10 @@
 - project:
     name: tsdr-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'tsdr'
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'tsdr'
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'tsdr'
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
index 26a6dde3e50047cd62669008274efe4d26072405..c555ea814b7aa5e89a3d61a098cf04fe3caa9ea1 100644 (file)
@@ -2,11 +2,10 @@
 - project:
     name: ttp-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'ttp'
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a693f948563d5
+
 - project:
     name: ttp-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'ttp'
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a693f948563d5
+
 - project:
     name: ttp-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'ttp'
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a693f948563d5
+
 - project:
     name: ttp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
index 269b6d4fc54517d1b6ebc7f10aa1a47264ac0b74..630a5b8eab4b5f066547f8f555b171b46a096ff8 100644 (file)
@@ -2,12 +2,10 @@
 - project:
     name: unimgr-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'unimgr'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
+
 - project:
     name: unimgr-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'unimgr'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
+
 - project:
     name: unimgr-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'unimgr'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a695d0a0b8d51
+
 - project:
     name: unimgr-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
index 5b0a902a1e6574e1cc9abe212f7392037b771356..1a66df1d78ca4215e55027e94927bd6957157c93 100644 (file)
@@ -2,13 +2,11 @@
 - project:
     name: usc-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'usc'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
     name: usc-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'usc'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
     name: usc-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'usc'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
     name: usc-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
index fcf7d75637e4018149ce45c6f076dc7de57e57c2..b93930ad3680bca2f15e68d0e62e8cf2c4cbc83f 100644 (file)
@@ -2,11 +2,10 @@
 - project:
     name: usecplugin-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'usecplugin'
     email-upstream: '[usecplugin] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69902281e037
+
 - project:
     name: usecplugin-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'usecplugin'
     email-upstream: '[usecplugin] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69902281e037
+
 - project:
     name: usecplugin-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'usecplugin'
     email-upstream: '[usecplugin] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69902281e037
+
 - project:
     name: usecplugin-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'usecplugin'
     project-name: 'usecplugin'
diff --git a/jjb/verify-gpg-signatures.sh b/jjb/verify-gpg-signatures.sh
deleted file mode 100644 (file)
index e00eab6..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-
-if git log --show-signature -1 | egrep -q 'gpg: Signature made.*key ID'; then
-   echo "git commit is gpg signed"
-else
-   echo "WARNING: gpg signature missing for the commit"
-fi
-
-# Don't fail the job for unsigned commits
-exit 0
index 86fd79dd86965d0f323810a80d3a2b98281aa0a7..3544b58d264ebcd266f447dbd0bb710a59f36f45 100644 (file)
@@ -2,13 +2,11 @@
 - project:
     name: vtn-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'vtn'
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
+    # Used by the release job
+    staging-profile-id: a699799dd6fc9
+
 - project:
     name: vtn-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'vtn'
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
+    # Used by the release job
+    staging-profile-id: a699799dd6fc9
+
 - project:
     name: vtn-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'vtn'
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
+    # Used by the release job
+    staging-profile-id: a699799dd6fc9
+
 - project:
     name: vtn-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'vtn'
     project-name: 'vtn'
     branch: 'master'
index 2bebf295005b7ec81a322c95d6f73c732d38f4b5..0c54b14c46701b2af9957f7318936b7ea56c3273 100644 (file)
@@ -2,11 +2,10 @@
 - project:
     name: yang-push-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'yang-push'
     email-upstream: '[yang-push]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69aae2832869
+
 - project:
     name: yang-push-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'yang-push'
     email-upstream: '[yang-push]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69aae2832869
+
 - project:
     name: yang-push-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'yang-push'
     email-upstream: '[yang-push]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69aae2832869
+
 - project:
     name: yang-push-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'master'
index e7c3ae7ea2308fb561505ff108e0a6ccc43dde7f..cdcdb8427de535e3343c95b081844169b2fd48d7 100644 (file)
@@ -2,10 +2,9 @@
 - project:
     name: yangide-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'yangide'
     email-upstream: '[yangide] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: fba306956f98
+
 - project:
     name: yangide-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'yangide'
     email-upstream: '[yangide] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: fba306956f98
+
 - project:
     name: yangide-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'yangide'
     email-upstream: '[yangide] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: fba306956f98
+
 - project:
     name: yangide-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'yangide'
     project-name: 'yangide'
index 91a75963513dfd6f1f50c189d1ce5eb5cc2c609c..9173f14e69f03fe5b4ff90378634038c7acdda96 100644 (file)
 
     dependencies: ''
     email-upstream: '[yangtools]'
-    archive-artifacts: ''
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
-    archive-artifacts: ''
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
-    archive-artifacts: ''
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 - project:
     name: yangtools-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'yangtools'
     project-name: 'yangtools'
index 78e3b64a87c1a3c3edeb0fd4aeaa86c8be385fa4..978296bb577415ebdce3b32e4e0414dd720577d4 100644 (file)
@@ -79,6 +79,10 @@ ensure_ubuntu_install() {
         # Retry installing package 5 times if necessary
         for i in {0..5}
         do
+
+            # Wait for any background apt processes to finish before running apt
+            while pgrep apt > /dev/null; do sleep 1; done
+
             echo "$i: Installing $pkg"
             if [ "$(dpkg-query -W -f='${Status}' "$pkg" 2>/dev/null | grep -c "ok installed")" -eq 0 ]; then
                 apt-cache policy "$pkg"