Merge pull request #141 from dhollinger/build-2.1.2

Update build tools for 2.1.2

build/vanagon/components/rubygem-colored.rb → build/vanagon/components/rubygem-colored2.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-component 'rubygem-colored' do |pkg, _settings, _platform|
-  pkg.version '1.2'
+component 'rubygem-colored2' do |pkg, _settings, _platform|
+  pkg.version '3.1.2'
   instance_eval File.read('build/vanagon/components/_base-rubygem.rb')
 end

build/vanagon/components/rubygem-cri.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 component 'rubygem-cri' do |pkg, _settings, _platform|
-  pkg.version '2.15.3'
+  pkg.version '2.15.10'
   instance_eval File.read('build/vanagon/components/_base-rubygem.rb')
 end

build/vanagon/components/rubygem-faraday.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 component 'rubygem-faraday' do |pkg, _settings, _platform|
-  pkg.version '0.9.2'
+  pkg.version '0.17.3'
   instance_eval File.read('build/vanagon/components/_base-rubygem.rb')
 end

build/vanagon/components/rubygem-faraday_middleware.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 component 'rubygem-faraday_middleware' do |pkg, _settings, _platform|
-  pkg.version '0.10.1'
+  pkg.version '0.14.0'
   instance_eval File.read('build/vanagon/components/_base-rubygem.rb')
 end

build/vanagon/components/rubygem-multi_json.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 component 'rubygem-multi_json' do |pkg, _settings, _platform|
-  pkg.version '1.14.1'
+  pkg.version '1.15.0'
   instance_eval File.read('build/vanagon/components/_base-rubygem.rb')
 end

build/vanagon/components/rubygem-puppet_forge.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 component 'rubygem-puppet_forge' do |pkg, _settings, _platform|
-  pkg.version '2.2.8'
+  pkg.version '2.3.4'
   instance_eval File.read('build/vanagon/components/_base-rubygem.rb')
 end

build/vanagon/components/rubygem-r10k.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 component 'rubygem-r10k' do |pkg, _settings, _platform|
-  pkg.version '3.3.0'
+  pkg.version '3.5.1'
   instance_eval File.read('build/vanagon/components/_base-rubygem.rb')
 end

build/vanagon/platforms/debian-10-amd64.rb

@@ -6,7 +6,7 @@
   plat.servicetype 'systemd'
   plat.codename 'buster'
 
-  plat.docker_image 'voxpupuli/pkg_builder:buster'
+  plat.docker_image 'voxpupuli/builder:buster'
   plat.docker_run_args '--privileged=true'
 
   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 rsync fakeroot'

build/vanagon/platforms/debian-9-amd64.rb

@@ -6,7 +6,7 @@
   plat.servicetype 'systemd'
   plat.codename 'stretch'
 
-  plat.docker_image 'voxpupuli/pkg_builder:stretch'
+  plat.docker_image 'voxpupuli/builder:stretch'
   plat.docker_run_args '--privileged=true'
 
   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 rsync fakeroot'

build/vanagon/platforms/el-7-x86_64.rb

@@ -5,7 +5,7 @@
   plat.defaultdir '/etc/sysconfig'
   plat.servicetype 'systemd'
 
-  plat.docker_image 'voxpupuli/pkg_builder:el7'
+  plat.docker_image 'voxpupuli/builder:el7'
   plat.docker_run_args '--privileged=true'
 
   plat.provision_with "yum update -y; yum groupinstall --assumeyes 'Development Tools'; yum install --assumeyes autoconf automake createrepo devscripts fakeroot rsync gcc make rpmdevtools rpm-libs yum-utils rpm-sign"

build/vanagon/platforms/el-8-x86_64.rb

@@ -5,7 +5,7 @@
   plat.defaultdir '/etc/sysconfig'
   plat.servicetype 'systemd'
 
-  plat.docker_image 'voxpupuli/pkg_builder:el8'
+  plat.docker_image 'voxpupuli/builder:el8'
   plat.docker_run_args '--privileged=true'
 
   plat.provision_with "yum update -y; yum groupinstall --assumeyes 'Development Tools'; yum install --assumeyes autoconf automake createrepo rsync gcc make rpmdevtools rpm-libs yum-utils rpm-sign"

build/vanagon/platforms/ubuntu-16.04-amd64.rb

@@ -6,7 +6,7 @@
   plat.codename 'xenial'
   plat.servicedir '/etc/systemd/system'
 
-  plat.docker_image 'voxpupuli/pkg_builder:xenial'
+  plat.docker_image 'voxpupuli/builder:xenial'
   plat.docker_run_args '--privileged=true'
 
   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 rsync fakeroot'

build/vanagon/platforms/ubuntu-18.04-amd64.rb

@@ -6,7 +6,7 @@
   plat.codename 'bionic'
   plat.servicedir '/etc/systemd/system'
 
-  plat.docker_image 'ubuntu_build:bionic'
+  plat.docker_image 'voxpupuli/builder:bionic'
   plat.docker_run_args '--privileged=true'
 
   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 rsync fakeroot'

build/vanagon/platforms/ubuntu-20.04-amd64.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+platform 'ubuntu-20.04-amd64' do |plat|
+  plat.defaultdir '/etc/default'
+  plat.servicetype 'systemd'
+  plat.codename 'focal'
+  plat.servicedir '/etc/systemd/system'
+
+  plat.docker_image 'voxpupuli/builder:focal'
+  plat.docker_run_args '--privileged=true'
+
+  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 rsync fakeroot'
+  plat.install_build_dependencies_with 'DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends --allow-unauthenticated'
+
+  packages = [
+    'libbz2-dev',
+    'libreadline-dev',
+    'make',
+    'pkg-config',
+    'zlib1g-dev',
+    'pl-cmake',
+    'pl-gcc',
+    'systemtap-sdt-dev',
+    'openjdk-8-jre-headless'
+  ]
+
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends #{packages.join(' ')}"
+
+  plat.output_dir File.join('deb', plat.get_codename, 'PC1')
+end

build/vanagon/projects/puppet-webhook.rb

@@ -4,7 +4,7 @@
   # Set preferred component versions
   platform = proj.get_platform
 
-  proj.version '2.1.0'
+  proj.version '2.1.2'
   proj.description 'The Webhook API server for trigger puppet actions'
   proj.license 'Apache 2.0'
   proj.vendor 'Vox Pupuli Organization <[email protected]>'
@@ -63,7 +63,7 @@
   proj.component 'rubygem-byebug'
   proj.component 'rubygem-capybara'
   proj.component 'rubygem-coderay'
-  proj.component 'rubygem-colored'
+  proj.component 'rubygem-colored2'
   proj.component 'rubygem-concurrent-ruby'
   proj.component 'rubygem-connection_pool'
   proj.component 'rubygem-coveralls'