Merge "Add devstack stein packer job"

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

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index a2d1fd44beef1159da4aa3a57601bfee1217f0df..64194b30c8c4e0ed9d1ef9572f2a14aab3b864a5 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -39,11 +39,28 @@
     build-timeout: 90
     cron: '00 H 1 * *'
 
+    platforms: centos-7
     templates: devstack
+
+- project:
+    name: packer-devstack-pre-pip-queens-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+    build-timeout: 75
+    cron: '00 H 1 * *'
+
     platforms: centos-7
+    templates: devstack-pre-pip-queens
 
 - project:
-    name: packer-devstack-pre-pip-pike-jobs
+    name: packer-devstack-pre-pip-rocky-jobs
     jobs:
       - gerrit-packer-merge
 
@@ -56,11 +73,11 @@
     build-timeout: 75
     cron: '00 H 1 * *'
 
-    templates: devstack-pre-pip-pike
     platforms: centos-7
+    templates: devstack-pre-pip-rocky
 
 - project:
-    name: packer-devstack-pre-pip-queens-jobs
+    name: packer-devstack-pre-pip-stein-jobs
     jobs:
       - gerrit-packer-merge
 
@@ -73,8 +90,8 @@
     build-timeout: 75
     cron: '00 H 1 * *'
 
-    templates: devstack-pre-pip-queens
     platforms: centos-7
+    templates: devstack-pre-pip-stein
 
 - project:
     name: packer-docker-jobs
@@ -90,7 +107,9 @@
     build-timeout: 60
     cron: '00 H 1 * *'
 
-    platforms: centos-7
+    platforms:
+      - centos-7
+      - ubuntu-16.04
     templates: docker
 
 - project:
@@ -107,10 +126,11 @@
     build-timeout: 90
     cron: '00 H 1 * *'
 
-    templates: gbp
     platforms:
-      - ubuntu-14.04
       - ubuntu-16.04
+      - ubuntu-18.04:
+          disable-job: true
+    templates: gbp
 
 - project:
     name: packer-mininet-ovs-2.5-jobs
@@ -126,8 +146,11 @@
     build-timeout: 60
     cron: '00 H 1 * *'
 
+    platforms:
+      - ubuntu-16.04
+      - ubuntu-18.04:
+          disable-job: true
     templates: mininet-ovs-2.5
-    platforms: ubuntu-16.04
 
 - project:
     name: packer-mininet-ovs-2.6-jobs
@@ -143,8 +166,11 @@
     build-timeout: 75
     cron: '00 H 1 * *'
 
+    platforms:
+      - ubuntu-16.04
+      - ubuntu-18.04:
+          disable-job: true
     templates: mininet-ovs-2.6
-    platforms: ubuntu-16.04
 
 - project:
     name: packer-mininet-ovs-2.8-jobs
@@ -160,8 +186,11 @@
     build-timeout: 90
     cron: '00 H 1 * *'
 
+    platforms:
+      - ubuntu-16.04
+      - ubuntu-18.04:
+          disable-job: true
     templates: mininet-ovs-2.8
-    platforms: ubuntu-16.04
 
 - project:
     name: packer-robot-jobs
@@ -194,5 +223,8 @@
     build-timeout: 90
     cron: '00 H 1 * *'
 
-    platforms: ubuntu-16.04
+    platforms:
+      - ubuntu-16.04
+      - ubuntu-18.04:
+          disable-job: true
     templates: kubernetes