vanagon 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cd74e5ec690b73ee51e201f896f81a448020c90509107ec229c603b19b578bb
-  data.tar.gz: 9584067cc8334e4b280f7105834ffa7efe08d62e5b418f89cc53ee90c6f436f6
+  metadata.gz: 9471f41441c2a8aea399d9a08961332b68e94e9a377b783e76d09857ffcec0d7
+  data.tar.gz: ea8ccc12852db54d70c58d17d66815fadc48604eabfdf456623357fef3c3dd21
 SHA512:
-  metadata.gz: 1637ab1e2874427d490551f7e166a6607aadf6fa4c452697d4eb857bd5735369ad3977f6e53efc1e6b99c3bbda6bb5a0422be4366ccebeab00eda49805a93d05
-  data.tar.gz: 2e476edabd0575c234b2b94a23947b2d0c9c5dced079648deea0a014e98b15bd69bee833e02d234ab11eb6949323ac4f9aa7743fcc07918ed8ef5833070de546
+  metadata.gz: 67e94d799467fc05efb1e3815c55d71f4ffee9b91126eacae5b24793a7d6cb1478f0aae5c936a946e6d78e0896ea92f970104fbc519f0de45389f36bec228e2e
+  data.tar.gz: 756ebf1259f45d5fd5c9a2e5050423bca7da0cf72d5ab3404551da4c9d868b2b68bfa03043ee3f6e070c1b86884076c43af3891cfa3841a5dec8b6909ee3faf5

data/lib/vanagon/engine/pooler.rb

@@ -16,7 +16,7 @@ class Vanagon
         super
 
         @available_poolers = %w[
-          https://vmpooler.delivery.puppetlabs.net
+          https://vmpooler-prod.k8s.infracore.puppet.net
           https://nspooler-prod.k8s.infracore.puppet.net
         ]
         @token = load_token

data/lib/vanagon/platform/defaults/redhatfips-8-x86_64.rb

@@ -0,0 +1,28 @@
+platform "redhatfips-8-x86_64" do |plat|
+  plat.servicedir "/usr/lib/systemd/system"
+  plat.defaultdir "/etc/sysconfig"
+  plat.servicetype "systemd"
+
+  packages = %w(
+    cmake
+    gcc-c++
+    java-1.8.0-openjdk-devel
+    libarchive
+    libsepol-devel
+    libselinux-devel
+    openssl-devel
+    pkgconfig
+    readline-devel
+    rpm-build
+    rpmdevtools
+    rsync
+    swig
+    systemtap-sdt-devel
+    yum-utils
+    zlib-devel
+  )
+
+  plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
+  plat.install_build_dependencies_with "dnf install -y --allowerasing "
+  plat.vmpooler_template "redhat-fips-8-x86_64"
+end

data/lib/vanagon/platform/defaults/ubuntu-18.04-aarch64.rb

@@ -0,0 +1,11 @@
+platform "ubuntu-18.04-aarch64" do |plat|
+  plat.servicedir "/lib/systemd/system"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "systemd"
+  plat.codename "bionic"
+
+  packages = %w(build-essential devscripts make quilt pkg-config debhelper rsync fakeroot cmake)
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}"
+  plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends "
+  plat.vmpooler_template "ubuntu-1804-arm64"
+end

data/lib/vanagon/platform.rb

@@ -339,10 +339,20 @@ class Vanagon
       return !!@name.match(/^(el|redhat|redhatfips)-.*$/)
     end
 
+    # Utility matcher to determine if the platform is of an EL 8 variety
+    #
+    # @return [true, false] true if it is an EL 8 variety, false otherwise
     def is_el8?
       return !!@name.match(/^(el|redhat|redhatfips)-8.*$/)
     end
 
+    # Utility matcher to determine if the platform is a FIPS platform
+    #
+    # @return [true, false] true if it is a FIPS platform, false otherwise
+    def is_fips?
+      return @name.include?('fips')
+    end
+
     # Utility matcher to determine is the platform is a sles variety
     #
     # @return [true, false] true if it is a sles variety, false otherwise

data/resources/rpm/project.spec.erb

@@ -33,15 +33,11 @@
 <%= var %>
 <% end -%>
 
-# This breaks on el8. This is a hack to unblock development.
 <%- if @platform.is_el8? %>
-%undefine __debug_package
-
 # Build el-8 packages without build-id files to prevent collision
 %define _build_id_links none
 <% end -%>
 
-
 # To avoid files installed but not packaged errors
 %global __os_install_post %{__os_install_post} \
     rm -rf %{buildroot}/usr/lib/debug

data/spec/lib/vanagon/component_spec.rb

@@ -151,8 +151,8 @@ describe "Vanagon::Component" do
       # Initialize a new instance of Vanagon::Component and define a
       # new secondary source that's *compressed*. We can now reason about
       # this instance and test behavior for retrieving secondary sources.
-      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @platform = plat._platform
 
       comp = Vanagon::Component::DSL.new('build-dir-test', {}, @platform)
@@ -173,8 +173,8 @@ describe "Vanagon::Component" do
       # Initialize a new instance of Vanagon::Component and define a
       # new secondary source that's *compressed*. We can now reason about
       # this instance and test behavior for retrieving secondary sources.
-      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @platform = plat._platform
 
       comp = Vanagon::Component::DSL.new('build-dir-test', {}, @platform)
@@ -190,8 +190,8 @@ describe "Vanagon::Component" do
       # Initialize a new instance of Vanagon::Component and define a
       # new secondary source that's *compressed*. We can now reason about
       # this instance and test behavior for retrieving secondary sources.
-      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @platform = plat._platform
 
       comp = Vanagon::Component::DSL.new('build-dir-test', {}, @platform)
@@ -206,8 +206,8 @@ describe "Vanagon::Component" do
       # Initialize a new instance of Vanagon::Component and define a
       # new secondary source that's *compressed*. We can now reason about
       # this instance and test behavior for retrieving secondary sources.
-      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @platform = plat._platform
 
       comp = Vanagon::Component::DSL.new('build-dir-test', {}, @platform)
@@ -225,8 +225,8 @@ describe "Vanagon::Component" do
     end
 
     let(:platform) do
-      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       plat._platform
     end
 

data/spec/lib/vanagon/platform/dsl_spec.rb

@@ -2,7 +2,6 @@ require 'vanagon/platform/dsl'
 
 describe 'Vanagon::Platform::DSL' do
   let (:deb_platform_block)    { "platform 'debian-test-fixture' do |plat| end" }
-  let (:el_5_platform_block)   { "platform 'el-5-fixture'        do |plat| end" }
   let (:el_6_platform_block)   { "platform 'el-6-fixture'        do |plat| end" }
   let (:redhat_7_platform_block) { "platform 'redhat-7-fixture' do |plat| end" }
   let (:sles_platform_block)   { "platform 'sles-test-fixture'   do |plat| end" }
@@ -62,9 +61,9 @@ describe 'Vanagon::Platform::DSL' do
 
   describe '#yum_repo' do
     it "grabs the file and adds .repo to it" do
-      plat = Vanagon::Platform::DSL.new('el-5-fixture')
+      plat = Vanagon::Platform::DSL.new('el-6-fixture')
       expect(SecureRandom).to receive(:hex).and_return(hex_value)
-      plat.instance_eval(el_5_platform_block)
+      plat.instance_eval(el_6_platform_block)
       plat.yum_repo(el_definition)
       expect(plat._platform.provisioning[0]).to include('rpm -q curl', 'yum -y install curl')
       expect(plat._platform.provisioning[1]).to include(
@@ -97,8 +96,8 @@ describe 'Vanagon::Platform::DSL' do
 
     describe "installs a rpm when given a rpm" do
       it 'uses rpm everywhere' do
-        plat = Vanagon::Platform::DSL.new('el-5-fixture')
-        plat.instance_eval(el_5_platform_block)
+        plat = Vanagon::Platform::DSL.new('el-6-fixture')
+        plat.instance_eval(el_6_platform_block)
         plat.yum_repo(el_definition_rpm)
         expect(plat._platform.provisioning[0]).to include('rpm -q curl', 'yum -y install curl')
         expect(plat._platform.provisioning[1]).to include(

data/spec/lib/vanagon/platform/rpm_spec.rb

@@ -2,7 +2,7 @@ require 'vanagon/platform'
 
 describe 'Vanagon::Platform::RPM' do
   platforms = [
-    { name: 'el-5-i386' },
+    { name: 'el-6-i386' },
     { name: 'fedora-21-x86_64', dist: 'f21' },
     { name: 'cisco-wrlinux-7-x86_64' }
   ]

data/spec/lib/vanagon/platform_spec.rb

@@ -49,19 +49,19 @@ describe "Vanagon::Platform" do
           end ],
       },
       {
-        :name                           => "el-5-i386",
+        :name                           => "el-6-i386",
         :os_name                        => "el",
-        :os_version                     => "5",
+        :os_version                     => "6",
         :architecture                   => "i386",
-        :output_dir                     => "el/5/products/i386",
-        :output_dir_with_target         => "el/5/thing/i386",
-        :output_dir_empty_string        => "el/5/i386",
-        :source_output_dir              => "el/5/products/SRPMS",
-        :source_output_dir_with_target  => "el/5/thing/SRPMS",
-        :source_output_dir_empty_string => "el/5/SRPMS",
+        :output_dir                     => "el/6/products/i386",
+        :output_dir_with_target         => "el/6/thing/i386",
+        :output_dir_empty_string        => "el/6/i386",
+        :source_output_dir              => "el/6/products/SRPMS",
+        :source_output_dir_with_target  => "el/6/thing/SRPMS",
+        :source_output_dir_empty_string => "el/6/SRPMS",
         :is_rpm                         => true,
         :is_el                          => true,
-        :block                          => %Q[ platform "el-5-i386" do |plat| end ],
+        :block                          => %Q[ platform "el-6-i386" do |plat| end ],
       },
       {
         :name                           => "redhat-7-x86_64",

data/spec/lib/vanagon/project/dsl_spec.rb

@@ -244,8 +244,8 @@ end" }
   describe "#provides" do
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @el_plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      @el_plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
       @deb_plat.instance_eval("platform 'ubuntu-16.04-amd64' do |plat| end")
     end
@@ -326,8 +326,8 @@ end" }
   describe "#replaces" do
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @el_plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      @el_plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
       @deb_plat.instance_eval("platform 'ubuntu-16.04-amd64' do |plat| end")
     end
@@ -404,8 +404,8 @@ end" }
   describe "#conflicts" do
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @el_plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      @el_plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
       @deb_plat.instance_eval("platform 'ubuntu-16.04-amd64' do |plat| end")
     end
@@ -488,8 +488,8 @@ end"
 
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @el_plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      @el_plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @osx_plat = Vanagon::Platform::DSL.new('osx-10.10-x86_64')
       @osx_plat.instance_eval("platform 'osx-10.10-x86_64' do |plat| end")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -172,12 +172,14 @@ files:
 - lib/vanagon/platform/defaults/osx-10.15-x86_64.rb
 - lib/vanagon/platform/defaults/osx-11-x86_64.rb
 - lib/vanagon/platform/defaults/redhatfips-7-x86_64.rb
+- lib/vanagon/platform/defaults/redhatfips-8-x86_64.rb
 - lib/vanagon/platform/defaults/sles-12-x86_64.rb
 - lib/vanagon/platform/defaults/sles-15-x86_64.rb
 - lib/vanagon/platform/defaults/solaris-11-i386.rb
 - lib/vanagon/platform/defaults/solaris-11-sparc.rb
 - lib/vanagon/platform/defaults/ubuntu-16.04-amd64.rb
 - lib/vanagon/platform/defaults/ubuntu-16.04-i386.rb
+- lib/vanagon/platform/defaults/ubuntu-18.04-aarch64.rb
 - lib/vanagon/platform/defaults/ubuntu-18.04-amd64.rb
 - lib/vanagon/platform/defaults/ubuntu-20.04-aarch64.rb
 - lib/vanagon/platform/defaults/ubuntu-20.04-amd64.rb
@@ -324,42 +326,42 @@ signing_key:
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
-- spec/lib/makefile_spec.rb
-- spec/lib/git/rev_list_spec.rb
+- spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/utilities/extra_files_signer_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
 - spec/lib/vanagon/extensions/ostruct/json_spec.rb
 - spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
 - spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/engine/local_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component/source/rewrite_spec.rb
-- spec/lib/vanagon/component/source/local_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source/git_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/source/local_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
 - spec/lib/vanagon/driver_spec.rb
+- spec/lib/makefile_spec.rb
+- spec/lib/git/rev_list_spec.rb