diff --git a/acceptance/config/nodes/all.yaml b/acceptance/config/nodes/all.yaml index 58c543252..0d08d9aec 100644 --- a/acceptance/config/nodes/all.yaml +++ b/acceptance/config/nodes/all.yaml @@ -1,55 +1,55 @@ HOSTS: master: roles: - master - agent platform: el-6-x86_64 hypervisor: vcloud template: redhat-6-x86_64 rhel-agent: roles: - agent platform: el-6-i386 hypervisor: vcloud template: redhat-6-i386 fedora-agent: roles: - agent platform: fedora-21-i386 hypervisor: vcloud template: fedora-21-i386 ubuntu-agent: roles: - agent - platform: ubuntu-lucid-i386 + platform: ubuntu-precise-i386 hypervisor: vcloud - template: ubuntu-1004-i386 + template: ubuntu-1204-i386 wheezy-agent: roles: - agent platform: debian-wheezy-i386 hypervisor: vcloud template: debian-7-i386 centos-agent: roles: - agent platform: centos-5-i386 hypervisor: vcloud template: centos-5-i386 solaris-agent: roles: - agent platform: solaris-11-x86_64 hypervisor: vcloud template: solaris-11-x86_64 win2003r2-ruby193-2: roles: - agent platform: windows-2003r2-32 hypervisor: vsphere snapshot: git CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/all_but_windows.yaml b/acceptance/config/nodes/all_but_windows.yaml index 716a8e90d..119fff8d9 100644 --- a/acceptance/config/nodes/all_but_windows.yaml +++ b/acceptance/config/nodes/all_but_windows.yaml @@ -1,49 +1,49 @@ HOSTS: master: roles: - master - agent platform: el-6-x86_64 hypervisor: vcloud template: redhat-6-x86_64 rhel-agent: roles: - agent platform: el-6-i386 hypervisor: vcloud template: redhat-6-i386 fedora-agent: roles: - agent platform: fedora-21-i386 hypervisor: vcloud template: fedora-21-i386 ubuntu-agent: roles: - agent - platform: ubuntu-lucid-i386 + platform: ubuntu-precise-i386 hypervisor: vcloud - template: ubuntu-1004-i386 + template: ubuntu-1204-i386 wheezy-agent: roles: - agent platform: debian-wheezy-i386 hypervisor: vcloud template: debian-7-i386 centos-agent: roles: - agent platform: centos-5-i386 hypervisor: vcloud template: centos-5-i386 solaris-agent: roles: - agent platform: solaris-11-x86_64 hypervisor: vcloud template: solaris-11-x86_64 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/all_linux.yaml b/acceptance/config/nodes/all_linux.yaml index 935621fa6..3c1c4ce98 100644 --- a/acceptance/config/nodes/all_linux.yaml +++ b/acceptance/config/nodes/all_linux.yaml @@ -1,43 +1,43 @@ HOSTS: master: roles: - master - agent platform: el-6-x86_64 hypervisor: vcloud template: redhat-6-x86_64 rhel-agent: roles: - agent platform: el-6-i386 hypervisor: vcloud template: redhat-6-i386 fedora-agent: roles: - agent platform: fedora-21-i386 hypervisor: vcloud template: fedora-21-i386 ubuntu-agent: roles: - agent - platform: ubuntu-lucid-i386 + platform: ubuntu-precise-i386 hypervisor: vcloud - template: ubuntu-1004-i386 + template: ubuntu-1204-i386 wheezy-agent: roles: - agent platform: debian-wheezy-i386 hypervisor: vcloud template: debian-7-i386 centos-agent: roles: - agent platform: centos-5-i386 hypervisor: vcloud template: centos-5-i386 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/lucid.yaml b/acceptance/config/nodes/lucid.yaml deleted file mode 100644 index b18651902..000000000 --- a/acceptance/config/nodes/lucid.yaml +++ /dev/null @@ -1,19 +0,0 @@ -HOSTS: - master: - roles: - - master - - agent - platform: ubuntu-lucid-x86_64 - hypervisor: vcloud - template: ubuntu-1004-x86_64 - agent: - roles: - - agent - platform: ubuntu-lucid-i386 - hypervisor: vcloud - template: ubuntu-1004-i386 -CONFIG: - datastore: instance0 - resourcepool: delivery/Quality Assurance/FOSS/Dynamic - folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/precise_and_lucid.yaml b/acceptance/config/nodes/trusty_and_precise.yaml similarity index 86% rename from acceptance/config/nodes/precise_and_lucid.yaml rename to acceptance/config/nodes/trusty_and_precise.yaml index df4f928b5..e56b437d1 100644 --- a/acceptance/config/nodes/precise_and_lucid.yaml +++ b/acceptance/config/nodes/trusty_and_precise.yaml @@ -1,19 +1,19 @@ HOSTS: master: roles: - master - agent platform: ubuntu-precise-x86_64 hypervisor: vcloud template: ubuntu-1204-x86_64 agent: roles: - agent - platform: ubuntu-lucid-i386 + platform: ubuntu-trusty-i386 hypervisor: vcloud - template: ubuntu-1004-i386 + template: ubuntu-1404-i386 CONFIG: datastore: instance0 resourcepool: delivery/Quality Assurance/FOSS/Dynamic folder: Delivery/Quality Assurance/FOSS/Dynamic pooling_api: http://vmpooler.delivery.puppetlabs.net/