Move gbp and p-verify definition to releng-packer

Move the last packer jobs out of releng-jobs.yaml to keep things
in one place.

Change-Id: I437f6c8db2f34400cfb5f2437d9590372f3e6ab6
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 1c75e131c489b6d84d54b0b7676d6dae52189c79..840e914d3506d338dbb619fcc5fc24ed55abd6e9 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -34,24 +34,6 @@
       https://jenkins.opendaylight.org/releng
       https://jenkins.opendaylight.org/sandbox
 
-- project:
-    name: packer-jobs
-    # packer jobs templates are defined in global-jjb
-    jobs:
-      - '{project-name}-packer-jobs'
-    project: 'releng/builder'
-    project-name: builder
-    branch: master
-    archive-artifacts: '**/*.log'
-    build-node: centos7-builder-2c-1g
-
-    platforms:
-      - ubuntu-14.04
-      - ubuntu-16.04
-
-    templates:
-      - gbp
-
 - job-template:
     name: builder-check-poms
     node: centos7-builder-2c-1g

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index 80096d44337ea6a6e169e80cb681aa424d1b29e2..ee99fdf7fd553b50786e274897c1f913add703f4 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -1,4 +1,13 @@
 ---
+- project:
+    name: packer-packer-verify-jobs
+    jobs:
+      - gerrit-packer-verify
+
+    project: releng/builder
+    project-name: builder
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: packer-builder-jobs
     jobs:
@@ -79,6 +88,24 @@
     platforms: centos-7
     templates: docker
 
+- 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
+
+    templates: gbp
+    platforms:
+      - ubuntu-14.04
+      - ubuntu-16.04
+
 - project:
     name: packer-mininet-ovs-2.5-jobs
     jobs: