Merge "Remove routermgr branch since no longer used"

[releng/builder.git] / jjb / releng-jobs.yaml

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index b17cd9cec69930c4f39c814714034c4261a358b6..5fd736c24d0139a77786b30f953002cc8cbe50d4 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -15,6 +15,8 @@
 
     templates:
         - devstack
+        - devstack-pre-pip-mitaka
+        - devstack-pre-pip-newton
         - docker
         - gbp
         - java-builder
@@ -34,10 +36,12 @@
           templates: mininet-ovs-2.5
         - platforms: ubuntu-14.04
           templates: java-builder
-        - platforms: centos
-          templates: gbp
         - platforms: ubuntu-14.04
           templates: robot
+        - platforms: ubuntu-14.04
+          templates: devstack-pre-pip-mitaka
+        - platforms: ubuntu-14.04
+          templates: devstack-pre-pip-newton
 
     project-type: freestyle
     archive-artifacts: '**/*.log'
@@ -53,8 +57,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -86,6 +91,7 @@
             gzip archives/job_output/*
 
         - releng-check-unicode
+        - verify-gpg-signature
 
     publishers:
         - email-notification:
@@ -102,8 +108,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -129,6 +136,7 @@
             files: 'scripts/**'
 
     builders:
+        - verify-gpg-signature
         - shell: |
             virtualenv $WORKSPACE/venv
             source $WORKSPACE/venv/bin/activate
@@ -154,8 +162,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -215,8 +224,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -253,8 +263,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -288,8 +299,9 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -332,8 +344,9 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters: