Merge "Update cloud image Ubuntu18.04 mininet ovs"

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

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index e98c1e681490d6a8190c96124f2a86fc08851f3f..aab44b24d912ef2080ea0f86b69d9f43e6823cac 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -24,7 +24,7 @@
 
     platforms:
       - centos-7
-      - centos-8
+      - centos-cs-8
     templates: builder
     update-cloud-image: true
 
@@ -116,36 +116,16 @@
 
     platforms:
       - centos-7
-      - ubuntu-16.04
       - ubuntu-18.04
+      - ubuntu-20.04
     templates: docker
     update-cloud-image: true
 
 - project:
-    name: packer-gbp-jobs
-    jobs:
-      - gerrit-packer-merge
-
-    project: releng/builder
-    project-name: builder
-    branch: master
-    archive-artifacts: "**/*.log"
-
-    build-node: centos7-builder-2c-1g
-    build-timeout: 90
-    cron: "00 H 1 * *"
-
-    platforms:
-      - ubuntu-16.04
-      - ubuntu-18.04:
-          disable-job: true
-    templates: gbp
-    update-cloud-image: true
-
-- project:
-    name: packer-mininet-ovs-2.5-jobs
+    name: packer-helm-jobs
     jobs:
       - gerrit-packer-merge
+      - gerrit-packer-verify-build
 
     project: releng/builder
     project-name: builder
@@ -157,29 +137,9 @@
     cron: "00 H 1 * *"
 
     platforms:
-      - ubuntu-16.04
       - ubuntu-18.04
-    templates: mininet-ovs-2.5
-    update-cloud-image: true
-
-- project:
-    name: packer-mininet-ovs-2.6-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:
-      - ubuntu-16.04
-      - ubuntu-18.04
-    templates: mininet-ovs-2.6
+      - centos-7
+    templates: helm
     update-cloud-image: true
 
 - project:
@@ -197,7 +157,6 @@
     cron: "00 H 1 * *"
 
     platforms:
-      - ubuntu-16.04
       - ubuntu-18.04
     templates: mininet-ovs-2.8
     update-cloud-image: true
@@ -216,7 +175,9 @@
     build-timeout: 60
     cron: "00 H 1 * *"
 
-    platforms: centos-7
+    platforms:
+      - centos-7
+      - centos-cs-8
     templates: robot
     update-cloud-image: true
 
@@ -234,6 +195,7 @@
     build-node: centos7-builder-2c-1g
     # update-cloud-image: true
     build-timeout: 10
+    submodule-disable: true
 
     gerrit-user: "jenkins-$SILO"
     gerrit-host: "git.opendaylight.org"