#291 Missing --can-fail option for spin-appliance
Merged 7 years ago by mikem. Opened 7 years ago by tkopecek.
tkopecek/koji missing-option  into  master

file modified
+2 -1
@@ -5860,7 +5860,8 @@ 

          print

  

      hub_opts = {}

-     hub_opts['optional_arches'] = task_opts.optional_arches.split(',')

+     if hasattr(task_opts, 'optional_arches'):

+         hub_opts['optional_arches'] = task_opts.optional_arches.split(',')

      passthru_opts = [

          'format', 'install_tree_url', 'isoname', 'ksurl',

          'ksversion', 'release', 'repo', 'scratch', 'skip_tag',

Missing option causes spin-appliance to fail.

it was omitted because spin-appliance is deprecated

Yes, but it is now failing on any call of this method. So, spin-appliance is completely unusable. Options: 1) this PR 2) remove spin-appliance completely.

Option 3: don't require this option in _build_image:

@@ -5860,7 +5860,8 @@ def _build_image(options, task_opts, session, args, img_type):
         print

     hub_opts = {}
-    hub_opts['optional_arches'] = task_opts.optional_arches.split(',')
+    if hasattr(task_opts, 'optional_arches'):
+        hub_opts['optional_arches'] = task_opts.optional_arches.split(',')
     passthru_opts = [
         'format', 'install_tree_url', 'isoname', 'ksurl',
         'ksversion', 'release', 'repo', 'scratch', 'skip_tag',

Looks good - PR changed to this.

11 new commits added

  • make optional_arches optional
  • be stricter about incrementable release values
  • more complex release values to test
  • unit test for get_next_release()
  • add disttag handling to get_next_release
  • preserve old option for compatibility
  • koji-shadow: fix log() invocation
  • koji-shadow: remove authca, it's not used for ssl_login any more
  • koji-shadow: allow use without certs
  • Fixed minor typo in writing koji code doc
  • Don't fail on unimported krbV
7 years ago

rebased

7 years ago

Pull-Request has been merged by mikem

7 years ago
Metadata