Move devstack to common-packer vars/centos-7.json

Migrate to using the centos-7.json from CP for devstack so that
we can stop maintaining the local centos.json var file.

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 9fad16fc8dd1651e7a2a2cdccaf5dab9267a803a..659fe3a1acb5db53b679f5369efd8f5d53fcbb21 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -46,16 +46,10 @@
     build-node: centos7-builder-2c-1g
 
     platforms:
-      - centos
       - ubuntu-14.04
       - ubuntu-16.04
 
     templates:
-      - devstack
-      - devstack-pre-pip-ocata:
-          build-timeout: 75
-      - devstack-pre-pip-pike:
-          build-timeout: 75
       - gbp
       - mininet-ovs-2.5:
           build-timeout: 60
@@ -63,28 +57,10 @@
           build-timeout: 75
 
     exclude:
-      - platforms: centos
-        templates: gbp
-      - platforms: centos
-        templates: mininet-ovs-2.5
-      - platforms: centos
-        templates: mininet-ovs-2.6
-      - platforms: ubuntu-14.04
-        templates: devstack-pre-pip-ocata
-      - platforms: ubuntu-14.04
-        templates: devstack-pre-pip-pike
-      - platforms: ubuntu-14.04
-        templates: devstack
       - platforms: ubuntu-14.04
         templates: mininet-ovs-2.5
       - platforms: ubuntu-14.04
         templates: mininet-ovs-2.6
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-ocata
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-pike
-      - platforms: ubuntu-16.04
-        templates: devstack
 
 - job-template:
     name: builder-check-poms

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index 6e876dd0120a187c290aae8c6d4ae154a747e91e..598b62f3d240842f5880c2d472773cb53458e370 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -15,6 +15,54 @@
     platforms: centos-7
     templates: builder
 
+- project:
+    name: packer-devstack-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: 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
+
+    templates: devstack-pre-pip-ocata
+    platforms: centos-7
+
+- project:
+    name: packer-devstack-pre-pip-pike-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
+
+    templates: devstack-pre-pip-pike
+    platforms: centos-7
+
 - project:
     name: packer-docker-jobs
     jobs:

diff --git a/packer/vars/centos.json b/packer/vars/centos.json
deleted file mode 100644 (file)
index 678a903..0000000
--- a/packer/vars/centos.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "base_image": "LF - CentOS 7.1711 (2017-11-05)",
-  "distro": "CentOS 7",
-  "ssh_user": "centos",
-  "cloud_user_data": "provision/rh-user_data.sh"
-}