diff --git a/acceptance/config/nodes/all.yaml b/acceptance/config/nodes/all.yaml index 58c543252a2..0d08d9aec1a 100644 --- a/acceptance/config/nodes/all.yaml +++ b/acceptance/config/nodes/all.yaml @@ -21,9 +21,9 @@ HOSTS: 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 diff --git a/acceptance/config/nodes/all_but_windows.yaml b/acceptance/config/nodes/all_but_windows.yaml index 716a8e90d71..119fff8d910 100644 --- a/acceptance/config/nodes/all_but_windows.yaml +++ b/acceptance/config/nodes/all_but_windows.yaml @@ -21,9 +21,9 @@ HOSTS: 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 diff --git a/acceptance/config/nodes/all_linux.yaml b/acceptance/config/nodes/all_linux.yaml index 935621fa685..3c1c4ce98a0 100644 --- a/acceptance/config/nodes/all_linux.yaml +++ b/acceptance/config/nodes/all_linux.yaml @@ -21,9 +21,9 @@ HOSTS: 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 diff --git a/acceptance/config/nodes/lucid.yaml b/acceptance/config/nodes/lucid.yaml deleted file mode 100644 index b18651902fc..00000000000 --- 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 df4f928b534..e56b437d101 100644 --- a/acceptance/config/nodes/precise_and_lucid.yaml +++ b/acceptance/config/nodes/trusty_and_precise.yaml @@ -9,9 +9,9 @@ HOSTS: 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