vanagon 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49e90bdaa700172f444cb3849dfbaa7d422c4912f081eb45a3466a45857b23d6
-  data.tar.gz: b88bbbadd07826f06f05d0ae766048af7e3bba74a859bc029c35bedcda6d710e
+  metadata.gz: dbfdc34ac75b70c6f96c6f767426d61ed0140be4e7e0fbee6cf9cf255f6b1c4b
+  data.tar.gz: 51109a1e790290e27d1b03674601f3209fc17df1431f860768b15b88534bc5aa
 SHA512:
-  metadata.gz: 188b11f3ca921713dba0f9c790b5bec8039dd3d2fe79488a76f4cb065ac616cc98ea3af03a5d7c78d29070d5bea547d8dc977beeaddfccf988f3dc738cbd18a2
-  data.tar.gz: e7d53de5ec39fbc9975e610f987511dbcf652ece373d7d2ed72c6965f5c358c734410f2992de2918bd38d5402fccdb9a753ada37a05c205fb0eee1143d340664
+  metadata.gz: 9166d82bf7623a2423ac6bd10becdc2c0bd1dd98808abf098b91c2818f7742152d8109fc778155646c36cb4295cab960fa60ae74d1e53ca1748cf4e9b049fac1
+  data.tar.gz: 63175335e9f35857aebd80da28d7777d40b13050136b62290acc54217b71dfbf3deb03f03d6c6af2bf6eb8ebc15d22ae64bef89e3f94425506c0e64f485d6838

data/lib/vanagon/component/dsl.rb

@@ -503,16 +503,6 @@ class Vanagon
         @component.activate_triggers << OpenStruct.new(:activate_name => activate_name)
       end
 
-      # Add post installation action that must exit successfully before restarting the service
-      #
-      # @param pkg_state [Array] the state in which the scripts should execute. Can be
-      #   one or multiple of 'install' and 'upgrade'.
-      # @param scripts [Array] the Bourne shell compatible scriptlet(s) to execute
-      def add_postinstall_required_action(pkg_state, scripts)
-        check_pkg_state_array(pkg_state)
-        @component.postinstall_required_actions << OpenStruct.new(:pkg_state => Array(pkg_state), :scripts => Array(scripts))
-      end
-
       # Adds action to run during the postinstall phase of packaging
       #
       # @param pkg_state [Array] the state in which the scripts should execute. Can be

data/lib/vanagon/component.rb

@@ -106,9 +106,6 @@ class Vanagon
     # activate_triggers is a one-dimentional Array of Strings, describing scripts that
     # should be executed when a package identifies an activate trigger
     attr_accessor :activate_triggers
-    # postinstall_required_actions is a two-dimensional Array, describing scripts that
-    # must be executed successfully after a given component is installed.
-    attr_accessor :postinstall_required_actions
     # postinstall_actions is a two-dimensional Array, describing scripts that
     # should be executed after a given component is installed.
     attr_accessor :postinstall_actions
@@ -179,7 +176,6 @@ class Vanagon
       @install_triggers = []
       @interest_triggers = []
       @activate_triggers = []
-      @postinstall_required_actions = []
       @postinstall_actions = []
       @preremove_actions = []
       @postremove_actions = []

data/lib/vanagon/platform/defaults/amazon-2023-aarch64.rb

@@ -0,0 +1,10 @@
+platform "amazon-2023-aarch64" do |plat|
+  plat.servicedir "/usr/lib/systemd/system"
+  plat.defaultdir "/etc/sysconfig"
+  plat.servicetype "systemd"
+
+  packages = %w(autoconf automake createrepo gcc gcc-c++ rsync cmake make rpm-libs rpm-build libarchive)
+  plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
+  plat.install_build_dependencies_with "dnf install -y --allowerasing "
+  plat.vmpooler_template "amazon-2023-arm64"
+end

data/lib/vanagon/platform/defaults/amazon-2023-x86_64.rb

@@ -0,0 +1,10 @@
+platform "amazon-2023-x86_64" do |plat|
+  plat.servicedir "/usr/lib/systemd/system"
+  plat.defaultdir "/etc/sysconfig"
+  plat.servicetype "systemd"
+
+  packages = %w(gcc gcc-c++ autoconf automake createrepo rsync cmake make rpm-libs rpm-build rpm-sign libtool libarchive)
+  plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
+  plat.install_build_dependencies_with "dnf install -y --allowerasing "
+  plat.vmpooler_template "amazon-2023-x86_64"
+end

data/lib/vanagon/platform/dsl.rb

@@ -38,7 +38,7 @@ class Vanagon
         @platform = case platform_name
                     when /^aix-/
                       Vanagon::Platform::RPM::AIX.new(@name)
-                    when /^(cisco-wrlinux|el|fedora|redhat|redhatfips)-/
+                    when /^(amazon|cisco-wrlinux|el|fedora|redhat|redhatfips)-/
                       Vanagon::Platform::RPM.new(@name)
                     when /^sles-/
                       Vanagon::Platform::RPM::SLES.new(@name)

data/lib/vanagon/project.rb

@@ -494,18 +494,6 @@ class Vanagon
       end
     end
 
-    # Collects the postinstall packaging actions that must exit successfully for the project and it's components
-    #  for the specified packaging state
-    #
-    # @param pkg_state [String] the package state we want to run the given scripts for.
-    #   Can be one of 'install' or 'upgrade'
-    # @return [String] string of Bourne shell compatible scriptlets to execute during the postinstall
-    #   phase of packaging during the state of the system defined by pkg_state (either install or upgrade)
-    def get_postinstall_required_actions(pkg_state)
-      scripts = components.flat_map(&:postinstall_required_actions).compact.select { |s| s.pkg_state.include? pkg_state }.map(&:scripts)
-      return ': no postinstall required scripts provided' if scripts.empty?
-      scripts.join("\n")
-    end
     # Collects the preremove packaging actions for the project and it's components
     # for the specified packaging state
     #

data/resources/rpm/project.spec.erb

@@ -242,17 +242,6 @@ fi
 
 
 %post
-# Run required postinstall scripts on install if defined
-if [ -e %{_localstatedir}/lib/rpm-state/%{name}/install ] ; then
-  <%= get_postinstall_required_actions("install") %>
-  rm %{_localstatedir}/lib/rpm-state/%{name}/install
-fi
-
-# Run required postinstall scripts on upgrade if defined
-if [ -e %{_localstatedir}/lib/rpm-state/%{name}/upgrade ] ; then
-  <%= get_postinstall_required_actions("upgrade") %>
-  rm %{_localstatedir}/lib/rpm-state/%{name}/upgrade
-fi
 <%- if @platform.is_aix? || (@platform.is_el? && @platform.os_version.to_i == 4) -%>
 ## EL-4 and AIX RPM don't have %posttrans, so we'll put them here
 # Run postinstall scripts on install if defined

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -170,6 +170,8 @@ files:
 - lib/vanagon/patch.rb
 - lib/vanagon/platform.rb
 - lib/vanagon/platform/deb.rb
+- lib/vanagon/platform/defaults/amazon-2023-aarch64.rb
+- lib/vanagon/platform/defaults/amazon-2023-x86_64.rb
 - lib/vanagon/platform/defaults/debian-10-amd64.rb
 - lib/vanagon/platform/defaults/debian-11-aarch64.rb
 - lib/vanagon/platform/defaults/debian-11-amd64.rb