vanagon 0.47.0 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a166d92c2d23c1fce61aa5ba9a05b9c41571738b8571fd01c2a97d15cc44fb7
-  data.tar.gz: '00979e76b8f21b4992c47d5bf6aa4be3290d2e5914062952bc7e05ddbf7f0eb8'
+  metadata.gz: 0ecd4e8de6a3e8428eb762ca4d55afa3e2cdf0071b703f18b395ab8c732432b9
+  data.tar.gz: ea05e7c2523d3d6a679d2bc8172262af6695d10ba0138c364f3fa1d29c631ef4
 SHA512:
-  metadata.gz: a2203572e393abc4b6a653353ce359231bad6837904ba63d8138d6c1fac73c521a16360e177d2d52cde66c6db452ea3f477a5b9b8abd56c88d2763d092d9ce41
-  data.tar.gz: 45a19856e054337092ba6802aee517384bd8280d9d15492b7abac9c8014456b7f89c2e74179ea03f5235c4a349fe4f35f28a435f32f5ad8940cfde58437a6acf
+  metadata.gz: 481a6c131897e1723066ea8f8ad0424e96a6b96b6bcad4f7ad13a4dcd52828d3c2a627ec492c5a8a7b2cd8853eaf8c06afda23e936a0593386e6d2e0948e087b
+  data.tar.gz: df1643f138142373e6156ed71e31f1b46c51c27212781d9d90c9fdca8ba76e49dd94c8f27714d48d1735be0f3fc2dda37916991983a9bac490028e7e2021394e

data/lib/vanagon/engine/docker.rb

@@ -40,7 +40,7 @@ class Vanagon
         extra_args = @platform.docker_run_args.nil? ? [] : @platform.docker_run_args
 
         Vanagon::Utilities.ex("#{@docker_cmd} run -d --name #{build_host_name}-builder #{ssh_args} #{extra_args.join(' ')} #{@platform.docker_image}")
-        @target = URI.new('localhost')
+        @target = URI.parse('localhost')
 
         wait_for_ssh unless @platform.use_docker_exec
       rescue StandardError => e

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

@@ -0,0 +1,10 @@
+platform "amazon-7-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("yum install -y --nogpgcheck  #{packages.join(' ')}")
+  plat.install_build_dependencies_with "yum install --assumeyes"
+  plat.vmpooler_template "amazon-7-arm64"
+end

data/lib/vanagon/platform/defaults/fedora-40-x86_64.rb

@@ -0,0 +1,17 @@
+platform 'fedora-40-x86_64' do |plat|
+  plat.servicedir '/usr/lib/systemd/system'
+  plat.defaultdir '/etc/sysconfig'
+  plat.servicetype 'systemd'
+  plat.dist 'fc40'
+
+  packages = %w[
+    autoconf automake bzip2-devel gcc gcc-c++ libselinux-devel
+    libsepol libsepol-devel make cmake pkgconfig readline-devel
+    rpmdevtools rsync swig zlib-devel systemtap-sdt-devel
+    perl-lib perl-FindBin
+  ]
+  plat.provision_with("/usr/bin/dnf install -y --best --allowerasing #{packages.join(' ')}")
+
+  plat.install_build_dependencies_with '/usr/bin/dnf install -y --best --allowerasing'
+  plat.vmpooler_template 'fedora-40-x86_64'
+end

data/spec/lib/vanagon/engine/docker_spec.rb

@@ -101,4 +101,26 @@ describe Vanagon::Engine::Docker do
       end
     end
   end
+
+  describe '#select_target' do
+    context 'when platform has use_docker_exec set' do
+      subject { described_class.new(platform_with_docker_exec) }
+
+      it 'starts a new docker instance' do
+        expect(Vanagon::Utilities).to receive(:ex).with("/usr/bin/docker run -d --name debian_10-slim-builder   debian:10-slim")
+
+        subject.select_target
+      end
+
+      it 'sets the target to a localhost URI' do
+        allow(Vanagon::Utilities).to receive(:ex)
+
+        subject.select_target
+
+        uri = subject.target
+        expect(uri).to be_an_instance_of(URI::Generic)
+        expect(uri.path).to eq('localhost')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.49.0
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -172,6 +172,7 @@ files:
 - 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/amazon-7-aarch64.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
@@ -190,6 +191,7 @@ files:
 - lib/vanagon/platform/defaults/el-9-x86_64.rb
 - lib/vanagon/platform/defaults/fedora-36-x86_64.rb
 - lib/vanagon/platform/defaults/fedora-38-x86_64.rb
+- lib/vanagon/platform/defaults/fedora-40-x86_64.rb
 - lib/vanagon/platform/defaults/osx-11-arm64.rb
 - lib/vanagon/platform/defaults/osx-11-x86_64.rb
 - lib/vanagon/platform/defaults/osx-12-arm64.rb