Merge pull request #3862 from melissa/maint/master/rm-lucid

(maint) Remove lucid from build targets
puppetlabs · Apr 28, 2015 · 17b75e2 · 17b75e2
2 parents 3c08957 + 3d65836
commit 17b75e2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/...tance/config/nodes/precise_and_lucid.yaml → ...ance/config/nodes/trusty_and_precise.yaml b/...tance/config/nodes/precise_and_lucid.yaml → ...ance/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

diff --git a/ext/build_defaults.yaml b/ext/build_defaults.yaml
@@ -2,7 +2,7 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-precise-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-trusty-i386.cow base-wheezy-i386.cow'
+cows: 'base-precise-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-trusty-i386.cow base-wheezy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'