Merge "Install dependencies required for building debs"

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 4002578bd47bdfedcf0c4bddabb95be10abdc3f7..caf99a049504cbff695f77928976d7bfd766de8e 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -5,9 +5,6 @@
       - '{project-name}-ci-jobs'
       - '{project-name}-verify-tox-{stream}'
       - 'builder-check-poms'
-      # Packer jobs
-      - 'builder-verify-packer'
-      - 'builder-merge-packer-{platforms}-{templates}'
       # OpenStack Related
       - 'builder-cleanup-old-images'
       - 'builder-delete-stale-nodes'
@@ -16,6 +13,28 @@
       - 'builder-update-csit-tests'
       - 'builder-update-image-list'
 
+    # The following values are only specified here
+    # so that code blocks look similar to other projects.
+    project: 'releng/builder'
+    project-name: builder
+    stream: master
+    branch: master
+    build-node: centos7-java-builder-2c-4g
+    archive-artifacts: '**/*.log'
+    build-timeout: 10
+
+- project:
+    name: builder-packer-jobs
+    jobs:
+      - 'builder-merge-packer-{platforms}-{templates}'
+      - 'builder-verify-packer'
+
+    project: 'releng/builder'
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+    build-timeout: 90
+
     platforms:
       - centos
       - ubuntu-14.04
@@ -24,6 +43,7 @@
     templates:
       - devstack
       - devstack-pre-pip-newton
+      - devstack-pre-pip-ocata
       - docker
       - gbp
       - java-builder
@@ -44,6 +64,8 @@
         templates: robot
       - platforms: ubuntu-14.04
         templates: devstack-pre-pip-newton
+      - platforms: ubuntu-14.04
+        templates: devstack-pre-pip-ocata
       - platforms: ubuntu-14.04
         templates: devstack
       - platforms: ubuntu-14.04
@@ -56,6 +78,8 @@
         templates: robot
       - platforms: ubuntu-16.04
         templates: devstack-pre-pip-newton
+      - platforms: ubuntu-16.04
+        templates: devstack-pre-pip-ocata
       - platforms: ubuntu-16.04
         templates: devstack
       - platforms: ubuntu-16.04
@@ -64,20 +88,12 @@
         templates: mininet
       - platforms: ubuntu-16.04
         templates: gbp
+      - platforms: ubuntu-16.04
+        templates: baseline
+      - platforms: centos
+        templates: baseline
 
 
-    project-type: freestyle
-    archive-artifacts: '**/*.log'
-    build-timeout: '60'
-
-    # The following values are only specified here
-    # so that code blocks look similar to other projects.
-    project: 'releng/builder'
-    project-name: builder
-    stream: master
-    branch: master
-    build-node: centos7-java-builder-2c-4g
-
 - job-template:
     name: builder-check-poms
     node: centos7-java-builder-2c-4g
@@ -110,8 +126,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 
 - job-template:
@@ -157,8 +172,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 
 - job-template:
@@ -195,8 +209,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 
 - job-template:
@@ -231,8 +244,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 
 - job-template:
@@ -280,8 +292,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'builder-verify-packer'
@@ -324,8 +335,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'builder-merge-packer-{platforms}-{templates}'
@@ -395,8 +405,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'builder-update-csit-tests'
@@ -454,11 +463,6 @@
           search_string: "csit"
           stream: "boron"
           jobs-filename: "csit_jobs_boron.lst"
-      - integration-list-jobs:
-          blacklist: '{csit-list-blacklist}'
-          search_string: "csit"
-          stream: "beryllium"
-          jobs-filename: "csit_jobs_beryllium.lst"
       - integration-replace-block-text:
           starting-regex: "'csit-list-nitrogen: >'"
           ending-regex: "'csit-list-carbon: >'"
@@ -471,13 +475,8 @@
           file-to-change: "'jjb/releng-defaults.yaml'"
       - integration-replace-block-text:
           starting-regex: "'csit-list-boron: >'"
-          ending-regex: "'csit-list-beryllium: >'"
-          file-with-changes-to-insert: "'csit_jobs_boron.lst'"
-          file-to-change: "'jjb/releng-defaults.yaml'"
-      - integration-replace-block-text:
-          starting-regex: "'csit-list-beryllium: >'"
           ending-regex: "'# CSIT TESTS END SED MARKER'"
-          file-with-changes-to-insert: "'csit_jobs_beryllium.lst'"
+          file-with-changes-to-insert: "'csit_jobs_boron.lst'"
           file-to-change: "'jjb/releng-defaults.yaml'"
       - shell: |
           git status
@@ -491,5 +490,4 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish