Merge "Remove Centos Docker packer jobs"

[ci-management.git] / jjb / ci-management / ci-management-packer-jobs.yaml

diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
index f781861..04b2f36 100644 (file)
--- a/jjb/ci-management/ci-management-packer-jobs.yaml
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -14,7 +14,9 @@
 
     platforms:
       - centos-7
+      - centos-7-arm64
       - ubuntu-16.04
+      - ubuntu-18.04-arm64
     templates: builder
 
 - project:
@@ -28,11 +30,11 @@
     archive-artifacts: '**/*.log'
 
     build-node: centos7-builder-2c-1g
-    build-timeout: 60
+    build-timeout: 90
 
     platforms:
-      - centos-7
       - ubuntu-16.04
+      - ubuntu-18.04-arm64
     templates: docker
 
 - project:
@@ -49,7 +51,6 @@
     build-timeout: 90
 
     platforms:
-      - centos-7
       - ubuntu-16.04
     templates: memcached
 
@@ -67,5 +68,22 @@
 
     platforms:
       - centos-7
-      - ubuntu-16.04
     templates: redis
+
+- project:
+    name: packer-helm-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+
+    platforms:
+      - centos-7
+      - ubuntu-16.04
+    templates: helm
+