diff --git a/acceptance/config/nodes/win2003-all.yaml b/acceptance/config/nodes/win2003-all.yaml deleted file mode 100644 index 1f27d0e72..000000000 --- a/acceptance/config/nodes/win2003-all.yaml +++ /dev/null @@ -1,38 +0,0 @@ -HOSTS: - master: - roles: - - master - - agent - platform: el-6-i386 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent-i386: - roles: - - agent - platform: windows-2003-32 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003-i386 - agent-x86_64: - roles: - - agent - platform: windows-2003-64 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003-x86_64 - agent-r2-i386: - roles: - - agent - platform: windows-2003r2-32 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-i386 - agent-r2-x86_64: - roles: - - agent - platform: windows-2003r2-64 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-x86_64 -CONFIG: - filecount: 12 - datastore: instance0 - resourcepool: delivery/Quality Assurance/FOSS/Dynamic - folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003r2.yaml b/acceptance/config/nodes/win2003r2x64-rubyx64.yaml similarity index 71% rename from acceptance/config/nodes/win2003r2.yaml rename to acceptance/config/nodes/win2003r2x64-rubyx64.yaml index d3c431736..5a94aab24 100644 --- a/acceptance/config/nodes/win2003r2.yaml +++ b/acceptance/config/nodes/win2003r2x64-rubyx64.yaml @@ -1,26 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent-r2-i386: - roles: - - agent - platform: windows-2003r2-32 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-i386 - agent-r2-x86_64: + agent-2003r2-x86_64-rubyx64: roles: - agent platform: windows-2003r2-64 + ruby_arch: x64 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2.yaml b/acceptance/config/nodes/win2003r2x64-rubyx86.yaml similarity index 83% copy from acceptance/config/nodes/win2008r2.yaml copy to acceptance/config/nodes/win2003r2x64-rubyx86.yaml index 56608a68a..d58429524 100644 --- a/acceptance/config/nodes/win2008r2.yaml +++ b/acceptance/config/nodes/win2003r2x64-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent: + agent-2003r2-x86_64-rubyx86: roles: - agent - platform: windows-2008r2-64 + platform: windows-2003r2-64 + ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 + template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2.yaml b/acceptance/config/nodes/win2003r2x86-rubyx86.yaml similarity index 85% copy from acceptance/config/nodes/win2008r2.yaml copy to acceptance/config/nodes/win2003r2x86-rubyx86.yaml index 56608a68a..d91bc7385 100644 --- a/acceptance/config/nodes/win2008r2.yaml +++ b/acceptance/config/nodes/win2003r2x86-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent: + agent-2003r2-i386: roles: - agent - platform: windows-2008r2-64 + platform: windows-2003r2-32 + ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 + template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2003.yaml b/acceptance/config/nodes/win2003x64-rubyx64.yaml similarity index 72% rename from acceptance/config/nodes/win2003.yaml rename to acceptance/config/nodes/win2003x64-rubyx64.yaml index 3d61fb2d4..4f6f0754e 100644 --- a/acceptance/config/nodes/win2003.yaml +++ b/acceptance/config/nodes/win2003x64-rubyx64.yaml @@ -1,26 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent-i386: - roles: - - agent - platform: windows-2003-32 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003-i386 - agent-x86_64: + agent-2003-x86_64-rubyx64: roles: - agent platform: windows-2003-64 + ruby_arch: x64 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/win-2003-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2.yaml b/acceptance/config/nodes/win2003x64-rubyx86.yaml similarity index 84% copy from acceptance/config/nodes/win2008r2.yaml copy to acceptance/config/nodes/win2003x64-rubyx86.yaml index 56608a68a..5929ab47d 100644 --- a/acceptance/config/nodes/win2008r2.yaml +++ b/acceptance/config/nodes/win2003x64-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent: + agent-2003-x86_64-rubyx86: roles: - agent - platform: windows-2008r2-64 + platform: windows-2003-64 + ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 + template: Delivery/Quality Assurance/Templates/vCloud/win-2003-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2.yaml b/acceptance/config/nodes/win2003x86-rubyx86.yaml similarity index 86% copy from acceptance/config/nodes/win2008r2.yaml copy to acceptance/config/nodes/win2003x86-rubyx86.yaml index 56608a68a..b558a5514 100644 --- a/acceptance/config/nodes/win2008r2.yaml +++ b/acceptance/config/nodes/win2003x86-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent: + agent-2003-i386: roles: - agent - platform: windows-2008r2-64 + platform: windows-2003-32 + ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 + template: Delivery/Quality Assurance/Templates/vCloud/win-2003-i386 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2.yaml b/acceptance/config/nodes/win2008-rubyx64.yaml similarity index 84% copy from acceptance/config/nodes/win2008r2.yaml copy to acceptance/config/nodes/win2008-rubyx64.yaml index 56608a68a..0892d7931 100644 --- a/acceptance/config/nodes/win2008r2.yaml +++ b/acceptance/config/nodes/win2008-rubyx64.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent: + agent-2008-x86_64-rubyx64: roles: - agent - platform: windows-2008r2-64 + platform: windows-2008-64 + ruby_arch: x64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 + template: Delivery/Quality Assurance/Templates/vCloud/win-2008-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2.yaml b/acceptance/config/nodes/win2008-rubyx86.yaml similarity index 84% copy from acceptance/config/nodes/win2008r2.yaml copy to acceptance/config/nodes/win2008-rubyx86.yaml index 56608a68a..5de98710b 100644 --- a/acceptance/config/nodes/win2008r2.yaml +++ b/acceptance/config/nodes/win2008-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent: + agent-2008-x86_64-rubyx86: roles: - agent - platform: windows-2008r2-64 + platform: windows-2008-64 + ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 + template: Delivery/Quality Assurance/Templates/vCloud/win-2008-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2.yaml b/acceptance/config/nodes/win2008r2-rubyx64.yaml similarity index 91% copy from acceptance/config/nodes/win2008r2.yaml copy to acceptance/config/nodes/win2008r2-rubyx64.yaml index 56608a68a..3de3f5db1 100644 --- a/acceptance/config/nodes/win2008r2.yaml +++ b/acceptance/config/nodes/win2008r2-rubyx64.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent: + agent-2008r2-x86_64-rubyx64: roles: - agent platform: windows-2008r2-64 + ruby_arch: x64 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008-all.yaml b/acceptance/config/nodes/win2008r2-rubyx86.yaml similarity index 71% rename from acceptance/config/nodes/win2008-all.yaml rename to acceptance/config/nodes/win2008r2-rubyx86.yaml index b9e052224..2020cc6c6 100644 --- a/acceptance/config/nodes/win2008-all.yaml +++ b/acceptance/config/nodes/win2008r2-rubyx86.yaml @@ -1,26 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent-2008r2-x86_64: + agent-2008r2-x86_64-rubyx86: roles: - agent platform: windows-2008r2-64 + ruby_arch: x86 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 - agent-2008-x86_64: - roles: - - agent - platform: windows-2008-64 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2.yaml b/acceptance/config/nodes/win2012-rubyx64.yaml similarity index 84% copy from acceptance/config/nodes/win2008r2.yaml copy to acceptance/config/nodes/win2012-rubyx64.yaml index 56608a68a..73b8488a1 100644 --- a/acceptance/config/nodes/win2008r2.yaml +++ b/acceptance/config/nodes/win2012-rubyx64.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent: + agent-2012-x86_64-rubyx64: roles: - agent - platform: windows-2008r2-64 + platform: windows-2012-64 + ruby_arch: x64 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 + template: Delivery/Quality Assurance/Templates/vCloud/win-2012-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2.yaml b/acceptance/config/nodes/win2012-rubyx86.yaml similarity index 84% copy from acceptance/config/nodes/win2008r2.yaml copy to acceptance/config/nodes/win2012-rubyx86.yaml index 56608a68a..9e18b234e 100644 --- a/acceptance/config/nodes/win2008r2.yaml +++ b/acceptance/config/nodes/win2012-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent: + agent-2012-x86_64-rubyx86: roles: - agent - platform: windows-2008r2-64 + platform: windows-2012-64 + ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 + template: Delivery/Quality Assurance/Templates/vCloud/win-2012-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2012-all.yaml b/acceptance/config/nodes/win2012r2-rubyx64.yaml similarity index 71% rename from acceptance/config/nodes/win2012-all.yaml rename to acceptance/config/nodes/win2012r2-rubyx64.yaml index 3e9a3d83f..59c35f4b9 100644 --- a/acceptance/config/nodes/win2012-all.yaml +++ b/acceptance/config/nodes/win2012r2-rubyx64.yaml @@ -1,26 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent-2012r2-x86_64: + agent-2012r2-x86_64-rubyx64: roles: - agent platform: windows-2012r2-64 + ruby_arch: x64 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/win-2012r2-x86_64 - agent-2012-x86_64: - roles: - - agent - platform: windows-2012-64 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2012-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/win2008r2.yaml b/acceptance/config/nodes/win2012r2-rubyx86.yaml similarity index 83% rename from acceptance/config/nodes/win2008r2.yaml rename to acceptance/config/nodes/win2012r2-rubyx86.yaml index 56608a68a..2ebb2dc71 100644 --- a/acceptance/config/nodes/win2008r2.yaml +++ b/acceptance/config/nodes/win2012r2-rubyx86.yaml @@ -1,20 +1,20 @@ HOSTS: master: roles: - master - agent platform: el-6-i386 hypervisor: vcloud template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent: + agent-2012r2-x86_64-rubyx86: roles: - agent - platform: windows-2008r2-64 + platform: windows-2012r2-64 + ruby_arch: x86 hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 + template: Delivery/Quality Assurance/Templates/vCloud/win-2012r2-x86_64 CONFIG: - filecount: 12 datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vcloud.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/windows-all.yaml b/acceptance/config/nodes/windows-all.yaml deleted file mode 100644 index d9d05ded5..000000000 --- a/acceptance/config/nodes/windows-all.yaml +++ /dev/null @@ -1,62 +0,0 @@ -HOSTS: - master: - roles: - - master - - agent - platform: el-6-i386 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-i386 - agent-2003-i386: - roles: - - agent - platform: windows-2003-32 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003-i386 - agent-2003-x86_64: - roles: - - agent - platform: windows-2003-64 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003-x86_64 - agent-2003r2-i386: - roles: - - agent - platform: windows-2003r2-32 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-i386 - agent-2003r2-x86_64: - roles: - - agent - platform: windows-2003r2-64 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2003r2-x86_64 - agent-2008r2-x86_64: - roles: - - agent - platform: windows-2008r2-64 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008r2-x86_64 - agent-2008-x86_64: - roles: - - agent - platform: windows-2008-64 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2008-x86_64 - agent-2012r2-x86_64: - roles: - - agent - platform: windows-2012r2-64 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2012r2-x86_64 - agent-2012-x86_64: - roles: - - agent - platform: windows-2012-64 - hypervisor: vcloud - template: Delivery/Quality Assurance/Templates/vCloud/win-2012-x86_64 -CONFIG: - filecount: 12 - datastore: instance0 - resourcepool: delivery/Quality Assurance/FOSS/Dynamic - folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/