machinery-tool 1.23.1 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ed904e69d49b3e93f3856cbd07b3cb91fab6e97
-  data.tar.gz: 62517703522da01d4778c3c15a1b7e3a9a37b29b
+SHA256:
+  metadata.gz: f19976fc2cd485e40e924ca5d471ae7d02af64443b99d44e10fa62e6b6433175
+  data.tar.gz: 7b79b1b6dd3f7dad21febe96778d67dcd371271803b1ca2ecbe503a54462f54f
 SHA512:
-  metadata.gz: 01683b8723d95685ed43ccdabcb655f3f5e75eb729511a5b62b6c7bfc18db023c34a62e654fd40f402f9ab5177597f7f4e7b9b84a57660e91e26304724fa0893
-  data.tar.gz: 2acfffcbd8dec94d924e1eda8136ef2cd063e9f60260a92c99053dad596cefc6e945fea27c4d8ac24a5795c138c7ec48e72e6a9908c73d61a00bd9ea50387b25
+  metadata.gz: dedaef9777f8160c200668fa035d4379bb3170e2040b7fa7da7777877a91737f3ac0c8052a077907825a53ef91c80470214065ce2c7011d603708ae0153077e3
+  data.tar.gz: f2f3031be5d4fceca617ce9a0983d7c33b7f41ce402d7a3659b2268ff5386798d706b64fe8be8945fb5be8800b399cf87a48310abb4a2c6ec583c69f89cc5662

data/.git_revision

@@ -1 +1 @@
-bbde951b3b681befceba3223d2c0678ff6213da9
+e489dbe0ef8a31fd814f1d8d8bc97725fa57c96a

data/NEWS

@@ -1,6 +1,17 @@
 # Machinery Release Notes
 
 
+## Version 1.24.0 - Tue Jul 02 15:22:38 CEST 2019 - thardeck@suse.de
+
+* Switch image building support from legacy Kiwi to Kiwi Next Generation
+* Allow newer json-schema releases than 2.2.5. Newer versions slow down parsing
+  of manifests but newer Ruby versions have issues with old json schema releases.
+  The performance issue is known upstream: (gh#ruby-json-schema/json-schema#261)
+* Fix machinery helper go version parsing (bsc#1125785)
+* Improve parsing of SSH exceptions (gh#SUSE/machinery#2257)
+* Allow inspection of old 32-bit systems even when their architecture is
+  reported as i586 or i386
+
 ## Version 1.23.1 - Fri Nov 24 17:33:39 CET 2017 - thardeck@suse.de
 
 * Allow inspection of old 32-bit systems which have no

data/export_helpers/kiwi_export_readme.md

@@ -5,18 +5,18 @@ Machinery.
 
 The user is expected to be familiar with using Kiwi, otherwise
 `machinery build` is recommended.
-Details on Kiwi can be found at http://opensuse.github.com/kiwi
+Details on Kiwi can be found at https://suse.github.com/kiwi
 
 
 ## Creating the image
 
 The following command builds the image:
 
-`sudo /usr/sbin/kiwi --build EXPORTED_DIRECTORY --destdir OUTPUT_DIRECTORY`
+`sudo kiwi-ng system build --description EXPORTED_DIRECTORY --target-dir OUTPUT_DIRECTORY`
 
 
 For example if the exported kiwi description is stored under "/tmp/export"
 and the image should be saved under "/tmp/image" the command would look like
 this:
 
-`sudo /usr/sbin/kiwi --build  /tmp/export --destdir /tmp/image`
+`sudo kiwi-ng system build --description  /tmp/export --target-dir /tmp/image`

data/export_helpers/merge_users_and_groups.pl.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 
 # Copyright (c) 2013-2016 SUSE LLC
 #

data/lib/build_task.rb

@@ -18,8 +18,9 @@
 class Machinery::BuildTask
   def build(system_description, output_path, options = {})
     Machinery::LocalSystem.validate_architecture("x86_64")
-    Machinery::LocalSystem.validate_existence_of_packages(["kiwi", "kiwi-desc-vmxboot"])
-    system_description.validate_build_compatibility
+    Machinery::LocalSystem.validate_existence_of_packages(
+      ["python3-kiwi", "kiwi-image-vmx-requires"]
+    )
 
     tmp_config_dir = Dir.mktmpdir("machinery-config", "/tmp")
     tmp_image_dir = Dir.mktmpdir("machinery-image", "/tmp")
@@ -110,7 +111,8 @@ class Machinery::BuildTask
 
   def kiwi_wrapper(tmp_config_dir, tmp_image_dir, output_path, image_extension)
     script = "#!/bin/bash\n"
-    script << "/usr/sbin/kiwi --build '#{tmp_config_dir}' --destdir '#{tmp_image_dir}' --logfile '#{tmp_image_dir}/kiwi-terminal-output.log'\n"
+    script << "/usr/bin/kiwi-ng --logfile='#{tmp_image_dir}/kiwi-terminal-output.log' system"
+    script << " build --description='#{tmp_config_dir}' --target-dir='#{tmp_image_dir}'\n"
     script << "if [ $? -eq 0 ]; then\n"
     script << "  mv '#{tmp_image_dir}/'*.#{image_extension} '#{output_path}'\n"
     script << "  rm -rf '#{tmp_image_dir}'\n"

data/lib/deploy_task.rb

@@ -21,7 +21,6 @@ class Machinery::DeployTask
     Machinery::LocalSystem.validate_existence_of_packages(
       ["python-glanceclient", "kiwi", "kiwi-desc-vmxboot"]
     )
-    description.validate_build_compatibility
 
     unless File.exist?(cloud_config)
       raise(Machinery::Errors::DeployFailed,

data/lib/exceptions.rb

@@ -153,6 +153,19 @@ module Machinery
       end
     end
 
+    # An error for inspecting a remote system as a non-root user
+    class SudoPasswordRequired < MachineryError
+      def initialize(host)
+        @host = host
+      end
+
+      def to_s
+        "`sudo` can be used only on #{@host}, when no password is required." \
+        " Make sure that you have the following line in `etc/sudoers` on the remote host:\n" \
+        " machinery ALL=(ALL) NOPASSWD: ALL"
+      end
+    end
+
     class MigrationError < MachineryError; end
 
     class InvalidFilter < MachineryError; end

data/lib/kiwi_config.rb

@@ -233,9 +233,7 @@ EOF
         xml.type(
           image: "vmx",
           filesystem: "ext3",
-          installiso: "true",
-          boot: @system_description.os.kiwi_boot,
-          format: "qcow2", bootloader: @system_description.os.kiwi_bootloader
+          format: "qcow2"
         )
       end
 
@@ -377,12 +375,8 @@ EOF
   end
 
   def enable_dhcp(output_location)
-    if @system_description.os.is_a?(Machinery::OsSles11)
-      write_dhcp_network_config(output_location, "eth0")
-    else
-      write_dhcp_network_config(output_location, "lan0")
-      write_persistent_net_rules(output_location)
-    end
+    write_dhcp_network_config(output_location, "lan0")
+    write_persistent_net_rules(output_location)
     puts "DHCP in built image will be enabled for the first device"
   end
 

data/lib/machinery_helper.rb

@@ -34,7 +34,9 @@ class MachineryHelper
   end
 
   def local_helper_path
-    File.join(local_helpers_path, "machinery-helper-#{@system.arch}")
+    File.join(
+      local_helpers_path, "machinery-helper-#{compatible_helper_arch(@system.arch)}"
+    )
   end
 
   def remote_helper_path
@@ -86,4 +88,16 @@ class MachineryHelper
     options[:privileged] = true
     @system.run_command(remote_helper_path, subcommand, *args, options)
   end
+
+  private
+
+  def compatible_helper_arch(system_arch)
+    if ["i586", "i386"].include?(system_arch)
+      "i686"
+    elsif system_arch == "armv6l"
+      "armv7l"
+    else
+      system_arch
+    end
+  end
 end

data/lib/remote_system.rb

@@ -197,7 +197,7 @@ class Machinery::RemoteSystem < Machinery::System
   # and raises an Machinery::Errors::SshConnectionFailed exception when it's not successful.
   def check_connection
     Machinery::LoggedCheetah.run(*build_command(:ssh), "-q", "-o", "BatchMode=yes",
-                      "#{remote_user}@#{host}", ":")
+      "#{remote_user}@#{host}", "LC_ALL=#{locale}", ":")
   rescue Cheetah::ExecutionFailed
     raise Machinery::Errors::SshConnectionFailed.new(
       "Could not establish SSH connection to host '#{host}'. Please make sure that " \
@@ -210,12 +210,14 @@ class Machinery::RemoteSystem < Machinery::System
   def check_sudo
     check_requirement("sudo", "-h")
     Machinery::LoggedCheetah.run(*build_command(:ssh), "-q", "-o", "BatchMode=yes",
-      "#{remote_user}@#{host}", "sudo", "id")
+      "#{remote_user}@#{host}", "LC_ALL=#{locale}", "sudo", "id")
   rescue Cheetah::ExecutionFailed => e
     if e.stderr && e.stderr.include?("password is required")
       raise Machinery::Errors::InsufficientPrivileges.new(remote_user, host)
     elsif e.stderr && e.stderr.include?("you must have a tty to run sudo")
       raise Machinery::Errors::SudoMissingTTY.new(host)
+    elsif e.stderr && e.stderr.include?("no tty present and no askpass program specified")
+      raise Machinery::Errors::SudoPasswordRequired.new(host)
     else
       raise e
     end

data/lib/system_description.rb

@@ -166,15 +166,6 @@ class Machinery::SystemDescription < Machinery::Object
     end
   end
 
-  def validate_build_compatibility
-    kiwi_template_path = "/usr/share/kiwi/image/#{os.kiwi_boot}"
-    unless Dir.exist?(kiwi_template_path)
-      raise Machinery::Errors::BuildFailed.new("The execution of the build script failed. " \
-        "Building of operating system '#{os.display_name}' can't be accomplished because the " \
-        "kiwi template file in `#{kiwi_template_path}` does not exist.")
-    end
-  end
-
   def to_hash
     meta = {}
     meta["format_version"] = self.format_version if self.format_version

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.23.1"
+  VERSION = "1.24.0"
 
 end

data/machinery-helper/version.go

@@ -2,4 +2,4 @@
 
 package main
 
-const VERSION = "bbde951b3b681befceba3223d2c0678ff6213da9"
+const VERSION = "e489dbe0ef8a31fd814f1d8d8bc97725fa57c96a"

data/manual/docs/index.html

@@ -83,12 +83,6 @@
                   <a  class="btn btn-default" href="http://github.com/SUSE/machinery">Get the source</a>
                 </div>
               </div>
-
-              <div>
-                <div class="git">
-                  <a  class="btn btn-default" href="https://machinery-project.blogspot.de/">Machinery Blog</a>
-                </div>
-              </div>
             </div>
 
             <div>
@@ -364,8 +358,8 @@
         </div>
 
         <div class="col-md-offset-3 col-md-6 footer">
-          <a href="mailto:machinery@lists.suse.com">Questions, Feedback, Suggestions</a>
-          <div class="credit">© <a href="http://suse.com">SUSE</a> 2014-2016</div>
+          <a href="https://github.com/SUSE/machinery/issues">Questions, Feedback, Suggestions</a>
+          <div class="credit">© <a href="http://suse.com">SUSE</a> 2014-2018</div>
         </div>
 
 

data/manual/docs/machinery.ymp

@@ -1,13 +1,13 @@
 <metapackage xmlns:os="http://opensuse.org/Standards/One_Click_Install" xmlns="http://opensuse.org/Standards/One_Click_Install">
 
-  <!-- openSUSE Leap 42.1 -->
-  <group distversion="openSUSE Leap 42.1">
+  <!-- openSUSE Leap 15.1 -->
+  <group distversion="openSUSE Leap 15.1">
     <repositories>
       <repository recommended="false">
-        <name>openSUSE Leap 42.1</name>
-        <summary>Test setup for openSUSE Leap 42.1</summary>
+        <name>openSUSE Leap 15.1</name>
+        <summary>Test setup for openSUSE Leap 15.1</summary>
         <description></description>
-        <url>http://download.opensuse.org/distribution/leap/42.1/repo/oss/</url>
+        <url>http://download.opensuse.org/distribution/leap/15.1/repo/oss/</url>
       </repository>
     </repositories>
     <software>
@@ -21,14 +21,14 @@ universal system description.</description>
     </software>
   </group>
 
-  <!-- openSUSE Leap 42.2 -->
-  <group distversion="openSUSE Leap 42.2">
+  <!-- openSUSE Leap 15.0 -->
+  <group distversion="openSUSE Leap 15.0">
     <repositories>
       <repository recommended="false">
-        <name>openSUSE Leap 42.2</name>
-        <summary>Test setup for openSUSE Leap 42.2</summary>
+        <name>openSUSE Leap 15.0</name>
+        <summary>Test setup for openSUSE Leap 15.0</summary>
         <description></description>
-        <url>http://download.opensuse.org/distribution/leap/42.2/repo/oss/</url>
+        <url>http://download.opensuse.org/distribution/leap/15.0/repo/oss/</url>
       </repository>
     </repositories>
     <software>

data/manual/mkdocs.yml

@@ -25,6 +25,8 @@ pages:
   - Show: machinery-show.1.md
   - "Upgrade Format": machinery-upgrade-format.1.md
   - Validate: machinery-validate.1.md
-theme_dir: 'custom_theme'
+theme:
+  name: mkdocs
+  custom_dir: custom_theme
 extra_templates:
 - 'index.html'

data/manual/site/404.html

@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <link href="//custom.css" rel="stylesheet">
+  </head>
+  <body id="manpage">
+    <div id="back">
+      <a href="/">
+        <img src="../hand3.png" class="hand3"/>
+        <div class="goback">Go back to the web site</div>
+      </a>
+    </div>
+    <div class="mp">
+      <div class="nav">
+        <ul>
+          
+              
+                  <li class="">
+                      <a href="docs/">Welcome</a>
+                  </li>
+              
+
+          
+              
+                  <li class="">
+                      <a href="machinery_main_general.1/">General Overview</a>
+                  </li>
+              
+
+          
+              
+                  <li class="">
+                      <a href="machinery_main_scopes.1/">Scopes</a>
+                  </li>
+              
+
+          
+              
+                  <li class="">
+                      <a href="machinery_main_usecases.1/">Use cases</a>
+                  </li>
+              
+
+          
+              
+                  <li class="">
+                      <a href="machinery_main_security_implications.1/">Security Implications</a>
+                  </li>
+              
+
+          
+              
+                  <li>Commands
+                      <ul>
+                      
+                          <li class="">
+                              <a href="machinery-analyze.1/">Analyze</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-build.1/">Build</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-compare.1/">Compare</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-config.1/">Config</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-copy.1/">Copy</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-deploy.1/">Deploy</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-export-autoyast.1/">Export AutoYaST</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-export-kiwi.1/">Export Kiwi</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-export-html.1/">Export HTML</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-inspect.1/">Inspect</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-inspect-container.1/">Inspect Container</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-list.1/">List</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-man.1/">Man</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-move.1/">Move</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-remove.1/">Remove</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-serve.1/">Serve</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-show.1/">Show</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-upgrade-format.1/">Upgrade Format</a>
+                          </li>
+                      
+                          <li class="">
+                              <a href="machinery-validate.1/">Validate</a>
+                          </li>
+                      
+                      </ul>
+                  </li>
+              
+
+          
+        </ul>
+      </div>
+      <div class="content">
+        
+      </div>
+    </div>
+  </body>
+</html>