2 files changed, 71 insertions, 23 deletions
diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
new file mode 100644
index 000000000..41a3853ef
--- /dev/null
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -0,0 +1,71 @@
+---
+- project:
+    name: packer-builder-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: ubuntu1604-builder-2c-1g
+    build-timeout: 90
+
+    platforms:
+      - centos-7
+      - ubuntu-16.04
+    templates: builder
+
+- project:
+    name: packer-docker-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: ubuntu1604-builder-2c-1g
+    build-timeout: 60
+
+    platforms:
+      - centos-7
+      - ubuntu-16.04
+    templates: docker
+
+- project:
+    name: packer-memcached-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: ubuntu1604-builder-2c-1g
+    build-timeout: 90
+
+    platforms:
+      - centos-7
+      - ubuntu-16.04
+    templates: memcached
+
+- project:
+    name: packer-redis-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: ubuntu1604-builder-2c-1g
+
+    platforms:
+      - centos-7
+      - ubuntu-16.04
+    templates: redis
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 528639e7d..184bf894d 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -12,29 +12,6 @@
     build-node: 'centos7-builder-2c-1g'
     jjb-version: 2.0.0
 
-- project:
-    name: packer-jobs
-    # packer jobs templates are defined in global-jjb
-    jobs:
-      - '{project-name}-packer-jobs'
-    project: 'ci-management'
-    project-name: 'ci-management'
-    branch: master
-    archive-artifacts: '**/*.log'
-    build-node: 'centos7-builder-2c-1g'
-    platforms:
-      - centos
-      - ubuntu-16.04
-    templates:
-      - builder
-      - docker
-      - memcached
-      - redis
-    exclude:
-      # only build the docker image on ubuntu at present
-      - platforms: centos
-        templates: docker
-
 - job-template:
     name: '{project}-verify-jjb'