Merge pull request puppetlabs#2 from shrug/3.8.x

(re-4105) Build for 3.8.x

Gemfile

@@ -2,6 +2,6 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 
 gem 'vanagon', '~> 0.1', :git => 'git@github.com:puppetlabs/vanagon', :branch => 'master'
-gem 'packaging', '0.4.0', :github => 'puppetlabs/packaging', :tag => '0.4.0'
+gem 'packaging', '0.4.1', :github => 'puppetlabs/packaging', :tag => '0.4.1'
 gem 'json'
 gem 'rake'

configs/components/rubygem-colored.rb

@@ -5,7 +5,7 @@
   puts  "checking http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
   pkg.url "http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
 
-  pkg.build_requires "puppet-agent"
+  pkg.build_requires "pe-ruby"
 
   pkg.install do
     "#{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem"

configs/components/rubygem-cri.rb

@@ -5,7 +5,7 @@
   puts  "checking http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
   pkg.url "http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
 
-  pkg.build_requires "puppet-agent"
+  pkg.build_requires "pe-ruby"
 
   pkg.install do
     "#{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem"

configs/components/rubygem-faraday.rb

@@ -5,7 +5,7 @@
   puts  "checking http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
   pkg.url "http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
 
-  pkg.build_requires "puppet-agent"
+  pkg.build_requires "pe-ruby"
 
   pkg.install do
     "#{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem"

configs/components/rubygem-faraday_middleware-multi_json.rb

@@ -6,7 +6,7 @@
   pkg.url "http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
 
 
-  pkg.build_requires "puppet-agent"
+  pkg.build_requires "pe-ruby"
 
   pkg.install do
     "#{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem"

configs/components/rubygem-json_pure.rb

@@ -5,7 +5,7 @@
   puts  "checking http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
   pkg.url "http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
 
-  pkg.build_requires "puppet-agent"
+  pkg.build_requires "pe-ruby"
 
   pkg.install do
     "#{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem"

configs/components/rubygem-log4r.rb

@@ -5,7 +5,7 @@
   puts  "checking http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
   pkg.url "http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
 
-  pkg.build_requires "puppet-agent"
+  pkg.build_requires "pe-ruby"
 
   pkg.install do
     "#{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem"

configs/components/rubygem-multi_json.rb

@@ -5,7 +5,7 @@
   puts  "checking http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
   pkg.url "http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
 
-  pkg.build_requires "puppet-agent"
+  pkg.build_requires "pe-ruby"
 
   pkg.install do
     "#{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem"

configs/components/rubygem-r10k.rb

@@ -5,11 +5,11 @@
   puts  "checking http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
   pkg.url "http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
 
-  pkg.build_requires "puppet-agent"
+  pkg.build_requires "pe-ruby"
 
   pkg.install do
     [ "#{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem"  , 
-      %q{sed -i '/require./aGem.path.unshift("\/opt\/puppetlabs\/server\/apps\/code-management")'  /opt/puppetlabs/server/bin/r10k}
+      %q{sed -i '/require./aGem.path.unshift("\/opt\/puppet\/lib\/r10k")'  /opt/puppet/bin/r10k}
     ]
   end
 end

configs/components/rubygem-rugged.rb

@@ -5,7 +5,7 @@
   puts  "checking http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
   pkg.url "http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
 
-  pkg.build_requires "puppet-agent"
+  pkg.build_requires "pe-ruby"
   pkg.build_requires "cmake"
   if platform.is_rpm?
     # red hat
@@ -16,7 +16,6 @@
   end
 
   pkg.install do
-    #[ "PKG_CONFIG_PATH=#{settings[:pkg_config_path]} #{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem -- --with-opt-dir=/opt/puppetlabs/agent/  ", "rm -rf /opt/puppetlabs/server/apps/code-management/gems/rugged-0.21.4/vendor/libgit2/build/" , "rm -rf /opt/puppetlabs/server/apps/code-management/gems/rugged-0.21.4/vendor/libgit2/src /opt/puppetlabs/server/apps/code-management/gems/rugged-0.21.4/vendor/libgit2/include /opt/puppetlabs/server/apps/code-management/gems/rugged-0.21.4/vendor/libgit2/deps /opt/puppetlabs/server/apps/code-management/gems/rugged-0.21.4/vendor/libgit2/cmake" ]
-    [ "PKG_CONFIG_PATH=#{settings[:pkg_config_path]} #{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem -- --with-opt-dir=/opt/puppetlabs/agent/  " ]
+    [ "PKG_CONFIG_PATH=#{settings[:pkg_config_path]} #{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem -- --with-opt-dir=/opt/puppet " ]
   end
 end

configs/components/rubygem-systemu.rb

@@ -5,7 +5,7 @@
   puts  "checking http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
   pkg.url "http://buildsources.delivery.puppetlabs.net/#{gemname}-#{pkg.get_version}.gem"
 
-  pkg.build_requires "puppet-agent"
+  pkg.build_requires "pe-ruby"
 
   pkg.install do
     "#{settings[:gem_inst]} #{gemname}-#{pkg.get_version}.gem"

configs/platforms/debian-6-amd64.rb

@@ -0,0 +1,11 @@
+peversion = IO.read('peversion').strip
+platform "debian-6-amd64" do |plat|
+  plat.servicedir "/etc/init.d"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "sysv"
+  plat.codename "squeeze"
+  plat.apt_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends build-essential devscripts make quilt pkg-config debhelper "
+  plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends --force-yes "
+  plat.vcloud_name "debian-6-x86_64"
+end

configs/platforms/debian-6-i386.rb

@@ -0,0 +1,11 @@
+peversion = IO.read('peversion').strip
+platform "debian-6-i386" do |plat|
+  plat.servicedir "/etc/init.d"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "sysv"
+  plat.codename "squeeze"
+  plat.apt_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends build-essential devscripts make quilt pkg-config debhelper "
+  plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends --force-yes "
+  plat.vcloud_name "debian-6-i386"
+end

configs/platforms/debian-7-amd64.rb

@@ -0,0 +1,11 @@
+peversion = IO.read('peversion').strip
+platform "debian-7-amd64" do |plat|
+  plat.servicedir "/etc/init.d"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "sysv"
+  plat.codename "wheezy"
+  plat.apt_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends build-essential devscripts make quilt pkg-config debhelper "
+  plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends --force-yes "
+  plat.vcloud_name "debian-7-x86_64"
+end

configs/platforms/debian-7-i386.rb

@@ -0,0 +1,11 @@
+peversion = IO.read('peversion').strip
+platform "debian-7-i386" do |plat|
+  plat.servicedir "/etc/init.d"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "sysv"
+  plat.codename "wheezy"
+  plat.apt_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends build-essential devscripts make quilt pkg-config debhelper "
+  plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends --force-yes "
+  plat.vcloud_name "debian-7-i386"
+end

configs/platforms/el-5-i386.rb

@@ -0,0 +1,10 @@
+peversion = IO.read('peversion').strip
+platform "el-5-i386" do |plat|
+  plat.servicedir "/etc/rc.d/init.d"
+  plat.defaultdir "/etc/sysconfig"
+  plat.servicetype "sysv"
+  plat.yum_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  plat.provision_with "yum install -y autoconf automake createrepo rsync gcc make rpm-libs rpm-build yum-utils"
+  plat.install_build_dependencies_with "yum install -y"
+  plat.vcloud_name "centos-5-i386"
+end

configs/platforms/el-5-x86_64.rb

@@ -0,0 +1,10 @@
+peversion = IO.read('peversion').strip
+platform "el-5-x86_64" do |plat|
+  plat.servicedir "/etc/rc.d/init.d"
+  plat.defaultdir "/etc/sysconfig"
+  plat.servicetype "sysv"
+  plat.yum_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  plat.provision_with "yum install -y autoconf automake createrepo rsync gcc make rpm-libs rpm-build yum-utils"
+  plat.install_build_dependencies_with "yum install -y"
+  plat.vcloud_name "centos-5-x86_64"
+end

configs/platforms/el-6-i386.rb

@@ -1,12 +1,10 @@
-tag = IO.read('puppet-agent-version').strip
+peversion = IO.read('peversion').strip
 platform "el-6-i386" do |plat|
   plat.servicedir "/etc/rc.d/init.d"
   plat.defaultdir "/etc/sysconfig"
   plat.servicetype "sysv"
-
-  plat.yum_repo "http://builds.puppetlabs.lan/puppet-agent/#{tag}/repo_configs/rpm/pl-puppet-agent-#{tag}-#{plat.get_name}.repo"
-  plat.yum_repo "http://pl-build-tools.delivery.puppetlabs.net/yum/pl-build-tools-release-el-6.noarch.rpm"
-  plat.provision_with "yum install --assumeyes autoconf automake createrepo rsync gcc make rpmdevtools rpm-libs yum-utils rpm-sign"
-  plat.install_build_dependencies_with "yum install --assumeyes"
+  plat.yum_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  plat.provision_with "yum install -y autoconf automake createrepo rsync gcc make rpmdevtools rpm-libs yum-utils rpm-sign"
+  plat.install_build_dependencies_with "yum install -y"
   plat.vcloud_name "centos-6-i386"
 end

configs/platforms/el-6-x86_64.rb

@@ -1,11 +1,9 @@
-tag = IO.read('puppet-agent-version').strip
+peversion = IO.read('peversion').strip
 platform "el-6-x86_64" do |plat|
   plat.servicedir "/etc/rc.d/init.d"
   plat.defaultdir "/etc/sysconfig"
   plat.servicetype "sysv"
-
-  plat.yum_repo "http://builds.puppetlabs.lan/puppet-agent/#{tag}/repo_configs/rpm/pl-puppet-agent-#{tag}-#{plat.get_name}.repo"
-  plat.yum_repo "http://pl-build-tools.delivery.puppetlabs.net/yum/pl-build-tools-release-el-6.noarch.rpm"
+  plat.yum_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
   plat.provision_with "yum install --assumeyes autoconf automake createrepo rsync gcc make rpmdevtools rpm-libs yum-utils rpm-sign"
   plat.install_build_dependencies_with "yum install --assumeyes"
   plat.vcloud_name "centos-6-x86_64"

configs/platforms/el-7-x86_64.rb

@@ -1,10 +1,9 @@
-tag = IO.read('puppet-agent-version').strip
+peversion = IO.read('peversion').strip
 platform "el-7-x86_64" do |plat|
   plat.servicedir "/usr/lib/systemd/system"
   plat.defaultdir "/etc/sysconfig"
   plat.servicetype "systemd"
-  plat.yum_repo "http://builds.puppetlabs.lan/puppet-agent/#{tag}/repo_configs/rpm/pl-puppet-agent-#{tag}-#{plat.get_name}.repo"
-  plat.yum_repo "http://pl-build-tools.delivery.puppetlabs.net/yum/pl-build-tools-release-el-7.noarch.rpm"
+  plat.yum_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
   plat.provision_with "yum install --assumeyes autoconf automake createrepo rsync gcc make rpmdevtools rpm-libs yum-utils rpm-sign"
   plat.install_build_dependencies_with "yum install --assumeyes"
   plat.vcloud_name "centos-7-x86_64"

configs/platforms/sles-11-i386.rb

@@ -1,10 +1,10 @@
-tag = IO.read('puppet-agent-version').strip
+peversion = IO.read('peversion').strip
 platform "sles-11-i386" do |plat|
   plat.servicedir "/etc/init.d"
   plat.defaultdir "/etc/sysconfig"
   plat.servicetype "sysv"
-
-  plat.provision_with "zypper install -y autoconf automake createrepo rsync gcc make"
-  plat.install_build_dependencies_with "zypper install -y"
+  plat.zypper_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  plat.provision_with "zypper -n --no-gpg-checks install -y aaa_base autoconf automake rsync gcc make"
+  plat.install_build_dependencies_with "zypper -n --no-gpg-checks install -y"
   plat.vcloud_name "sles-11-i386"
 end

configs/platforms/sles-11-x86_64.rb

@@ -1,10 +1,12 @@
-tag = IO.read('puppet-agent-version').strip
+peversion = IO.read('peversion').strip
 platform "sles-11-x86_64" do |plat|
   plat.servicedir "/etc/init.d"
   plat.defaultdir "/etc/sysconfig"
   plat.servicetype "sysv"
-
-  plat.provision_with "zypper install -y autoconf automake createrepo rsync gcc make"
-  plat.install_build_dependencies_with "zypper install -y"
+  plat.zypper_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  # Don't take this one out. SLES 11 is special
+  plat.zypper_repo "http://osmirror.delivery.puppetlabs.net/sles-11-deps-x86_64/sles-11-deps-x86_64.repo"
+  plat.provision_with "zypper -n --no-gpg-checks install -y aaa_base autoconf automake rsync gcc make"
+  plat.install_build_dependencies_with "zypper -n --no-gpg-checks install -y"
   plat.vcloud_name "sles-11-x86_64"
 end

configs/platforms/sles-12-x86_64.rb

@@ -1,10 +1,10 @@
-tag = IO.read('puppet-agent-version').strip
+peversion = IO.read('peversion').strip
 platform "sles-12-x86_64" do |plat|
-  plat.servicedir "/usr/lib/systemd/system"
+  plat.servicedir "/etc/init.d"
   plat.defaultdir "/etc/sysconfig"
-  plat.servicetype "systemd"
-
-  plat.provision_with "zypper install -y autoconf automake createrepo rsync gcc make rpm-build"
-  plat.install_build_dependencies_with "zypper install -y"
+  plat.servicetype "sysv"
+  plat.zypper_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  plat.provision_with "zypper -n --no-gpg-checks install -y aaa_base autoconf automake rsync gcc make rpm-build"
+  plat.install_build_dependencies_with "zypper -n --no-gpg-checks install -y"
   plat.vcloud_name "sles-12-x86_64"
 end

configs/platforms/ubuntu-10.04-amd64.rb

@@ -0,0 +1,11 @@
+peversion = IO.read('peversion').strip
+platform "ubuntu-10.04-amd64" do |plat|
+  plat.servicedir "/etc/init.d"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "sysv"
+  plat.codename "lucid"
+  plat.apt_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends build-essential devscripts make quilt pkg-config debhelper fakeroot "
+  plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends --force-yes "
+  plat.vcloud_name "ubuntu-1004-x86_64"
+end

configs/platforms/ubuntu-10.04-i386.rb

@@ -0,0 +1,11 @@
+peversion = IO.read('peversion').strip
+platform "ubuntu-10.04-i386" do |plat|
+  plat.servicedir "/etc/init.d"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "sysv"
+  plat.codename "lucid"
+  plat.apt_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends build-essential devscripts make quilt pkg-config debhelper fakeroot"
+  plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends --force-yes "
+  plat.vcloud_name "ubuntu-1004-i386"
+end

configs/platforms/ubuntu-12.04-amd64.rb

@@ -1,11 +1,10 @@
-tag = IO.read('puppet-agent-version').strip
+peversion = IO.read('peversion').strip
 platform "ubuntu-12.04-amd64" do |plat|
   plat.servicedir "/etc/init.d"
   plat.defaultdir "/etc/default"
   plat.servicetype "sysv"
   plat.codename "precise"
-  plat.apt_repo "http://builds.puppetlabs.lan/puppet-agent/#{tag}/repo_configs/deb/pl-puppet-agent-#{tag}-#{plat.get_codename}.list"
-  plat.apt_repo "http://pl-build-tools.delivery.puppetlabs.net/debian/pl-build-tools-release-#{plat_get_codename}.deb"
+  plat.apt_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
   plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends build-essential devscripts make quilt pkg-config debhelper "
   plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends --force-yes "
   plat.vcloud_name "ubuntu-1204-x86_64"

configs/platforms/ubuntu-12.04-i386.rb

@@ -1,11 +1,10 @@
-tag = IO.read('puppet-agent-version').strip
+peversion = IO.read('peversion').strip
 platform "ubuntu-12.04-i386" do |plat|
   plat.servicedir "/etc/init.d"
   plat.defaultdir "/etc/default"
   plat.servicetype "sysv"
   plat.codename "precise"
-  plat.apt_repo "http://builds.puppetlabs.lan/puppet-agent/#{tag}/repo_configs/deb/pl-puppet-agent-#{tag}-#{plat.get_codename}.list"
-  plat.apt_repo "http://pl-build-tools.delivery.puppetlabs.net/debian/pl-build-tools-release-#{plat_get_codename}.deb"
+  plat.apt_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
   plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends build-essential devscripts make quilt pkg-config debhelper "
   plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends --force-yes "
   plat.vcloud_name "ubuntu-1204-i386"

configs/platforms/ubuntu-14.04-amd64.rb

@@ -1,15 +1,11 @@
-tag = IO.read('puppet-agent-version').strip
-
+peversion = IO.read('peversion').strip
 platform "ubuntu-14.04-amd64" do |plat|
   plat.servicedir "/etc/init.d"
   plat.defaultdir "/etc/default"
   plat.servicetype "sysv"
   plat.codename "trusty"
-
-   plat.apt_repo "http://builds.puppetlabs.lan/puppet-agent/#{tag}/repo_configs/deb/pl-puppet-agent-#{tag}-#{plat.get_codename}.list"
-  plat.apt_repo "http://pl-build-tools.delivery.puppetlabs.net/debian/pl-build-tools-release-#{plat_get_codename}.deb"
+  plat.apt_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
   plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends build-essential devscripts make quilt pkg-config debhelper "
   plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends --force-yes "
-
   plat.vcloud_name "ubuntu-1404-x86_64"
 end

configs/platforms/ubuntu-14.04-i386.rb

@@ -1,12 +1,11 @@
-tag = IO.read('puppet-agent-version').strip
+peversion = IO.read('peversion').strip
 platform "ubuntu-14.04-i386" do |plat|
   plat.servicedir "/etc/init.d"
   plat.defaultdir "/etc/default"
   plat.servicetype "sysv"
   plat.codename "trusty"
-  plat.vcloud_name "ubuntu-1404-i386"
-  plat.apt_repo "http://builds.puppetlabs.lan/puppet-agent/#{tag}/repo_configs/deb/pl-puppet-agent-#{tag}-#{plat.get_codename}.list"
-  plat.apt_repo "http://pl-build-tools.delivery.puppetlabs.net/debian/pl-build-tools-release-#{plat_get_codename}.deb"
+  plat.apt_repo "http://enterprise.delivery.puppetlabs.net/#{peversion}/repos/#{plat.get_name}/#{plat.get_name}.repo"
   plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends build-essential devscripts make quilt pkg-config debhelper "
   plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends --force-yes "
+  plat.vcloud_name "ubuntu-1404-i386"
 end