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 1de2a6e000cbf193201f3a07aa7f794973934756..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