Split out the nodesets again (voxpupuli#174).

locp · Feb 20, 2016 · 18c11e3 · 18c11e3
1 parent 352461d
commit 18c11e3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git a/spec/acceptance/nodesets/circle_centos6.yml b/spec/acceptance/nodesets/circle_centos6.yml
@@ -0,0 +1,14 @@
+HOSTS:
+  centos6:
+    roles:
+      - centos6
+      - nodes
+    platform: el-6-x86_64
+    image: centos:6
+    hypervisor: docker
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'yum -y install gcc tar'
+CONFIG:
+  type: foss
+  log_level: info
diff --git a/spec/acceptance/nodesets/centos.yml → spec/acceptance/nodesets/circle_centos7.yml b/spec/acceptance/nodesets/centos.yml → spec/acceptance/nodesets/circle_centos7.yml
@@ -10,16 +10,6 @@ HOSTS:
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
       - 'yum -y install gcc tar systemd-container initscripts'
-  centos6:
-    roles:
-      - centos6
-      - nodes
-    platform: el-6-x86_64
-    image: centos:6
-    hypervisor: docker
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      - 'yum -y install gcc tar'
 CONFIG:
   type: foss
   log_level: info
diff --git a/spec/acceptance/nodesets/debian.yml → spec/acceptance/nodesets/circle_debian7.yml b/spec/acceptance/nodesets/debian.yml → spec/acceptance/nodesets/circle_debian7.yml
diff --git a/spec/acceptance/nodesets/ubuntu.yml → spec/acceptance/nodesets/circle_ubuntu12.yml b/spec/acceptance/nodesets/ubuntu.yml → spec/acceptance/nodesets/circle_ubuntu12.yml
@@ -1,14 +1,4 @@
 HOSTS:
-  ubuntu1404:
-    roles:
-      - master
-      - nodes
-      - ubuntu14
-    platform: ubuntu-14.04-x64
-    image: ubuntu:14.04
-    hypervisor: docker
-    docker_image_commands:
-      - 'apt-get install -y iptables sudo'
   ubuntu1204:
     roles:
       - nodes

diff --git a/spec/acceptance/nodesets/circle_ubuntu14.yml b/spec/acceptance/nodesets/circle_ubuntu14.yml
@@ -0,0 +1,14 @@
+HOSTS:
+  ubuntu1404:
+    roles:
+      - master
+      - nodes
+      - ubuntu14
+    platform: ubuntu-14.04-x64
+    image: ubuntu:14.04
+    hypervisor: docker
+    docker_image_commands:
+      - 'apt-get install -y iptables sudo'
+CONFIG:
+  type: foss
+  log_level: info