X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-packer-jobs.yaml;h=8088d22df074fb43f28e37671fe9caf7555bf84f;hb=524848efcf8d06ccf19d966e3eb94913cbc78507;hp=f79f8a5520a1ec101c26dc84aec34478fb287dd8;hpb=7238b8b21b58c99536b529c48be3b4532a25d9b7;p=releng%2Fbuilder.git

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index f79f8a552..8088d22df 100644
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -39,28 +39,11 @@
     build-timeout: 90
     cron: '00 H 1 * *'
 
-    templates: devstack
-    platforms: centos-7
-
-- project:
-    name: packer-devstack-pre-pip-ocata-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 * *'
-
-    templates: devstack-pre-pip-ocata
     platforms: centos-7
+    templates: devstack
 
 - project:
-    name: packer-devstack-pre-pip-pike-jobs
+    name: packer-devstack-pre-pip-queens-jobs
     jobs:
       - gerrit-packer-merge
 
@@ -73,11 +56,11 @@
     build-timeout: 75
     cron: '00 H 1 * *'
 
-    templates: devstack-pre-pip-pike
     platforms: centos-7
+    templates: devstack-pre-pip-queens
 
 - project:
-    name: packer-devstack-pre-pip-queens-jobs
+    name: packer-devstack-pre-pip-rocky-jobs
     jobs:
       - gerrit-packer-merge
 
@@ -90,8 +73,8 @@
     build-timeout: 75
     cron: '00 H 1 * *'
 
-    templates: devstack-pre-pip-queens
     platforms: centos-7
+    templates: devstack-pre-pip-rocky
 
 - project:
     name: packer-docker-jobs
@@ -107,7 +90,9 @@
     build-timeout: 60
     cron: '00 H 1 * *'
 
-    platforms: centos-7
+    platforms:
+      - centos-7
+      - ubuntu-16.04
     templates: docker
 
 - project:
@@ -124,10 +109,12 @@
     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
@@ -143,8 +130,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
@@ -160,8 +150,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
@@ -177,8 +170,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
@@ -211,5 +207,8 @@
     build-timeout: 90
     cron: '00 H 1 * *'
 
-    platforms: ubuntu-16.04
+    platforms:
+      - ubuntu-16.04
+      - ubuntu-18.04:
+          disable-job: true
     templates: kubernetes