IF YOU WOULD LIKE TO GET AN ACCOUNT, please write an email to s dot adaszewski at gmail dot com. User accounts are meant only to report issues and/or generate pull requests. This is a purpose-specific Git hosting for ADARED projects. Thank you for your understanding!
Przeglądaj źródła

Add dry run mode to focker bootstrap for testing purposes.

master
rodzic
commit
9de528d5c2
3 zmienionych plików z 15 dodań i 9 usunięć
  1. +5
    -4
      focker/bootstrap.py
  2. +1
    -0
      focker/focker.py
  3. +9
    -5
      tests/test_bootstrap.py

+ 5
- 4
focker/bootstrap.py Wyświetl plik

@@ -15,9 +15,10 @@ def command_bootstrap(args):
name = find_prefix(poolname + '/focker/images/', sha256)
subprocess.check_output(['zfs', 'create', '-o', 'focker:sha256=' + sha256, name])
zfs_tag(name, tags)
res = subprocess.run(['bsdinstall', 'jail', zfs_mountpoint(name)])
if res.returncode != 0:
zfs_run(['zfs', 'destroy', '-r', '-f', name])
raise ValueError('bsdinstall failed')
if not args.dry_run:
res = subprocess.run(['bsdinstall', 'jail', zfs_mountpoint(name)])
if res.returncode != 0:
zfs_run(['zfs', 'destroy', '-r', '-f', name])
raise ValueError('bsdinstall failed')
subprocess.check_output(['zfs', 'set', 'rdonly=on', name])
subprocess.check_output(['zfs', 'snapshot', name + '@1'])

+ 1
- 0
focker/focker.py Wyświetl plik

@@ -79,6 +79,7 @@ def create_parser():
parser = ListForwarder([subparsers_top.add_parser(cmd) for cmd in ['bootstrap', 'boot', 'bs']])
parser.set_defaults(func=command_bootstrap)
parser.add_argument('--tags', '-t', type=str, nargs='+', default=None)
parser.add_argument('--dry-run', '-d', action='store_true')
# image
subparsers = ListForwarder([ subparsers_top.add_parser(cmd).add_subparsers(dest='L2_command') \


+ 9
- 5
tests/test_bootstrap.py Wyświetl plik

@@ -1,13 +1,17 @@
import subprocess
from focker.zfs import *
import re
import os
def test_bootstrap():
subprocess.run(['focker', 'image', 'remove', '--force', 'test-focker-bootstrap'])
subprocess.run(['focker', 'bootstrap', '--tags', 'test-focker-bootstrap'])
name, sha256 = zfs_find('test-focker-bootstrap', focker_type='volume')
assert len(name) >= 7
assert re.search('[a-f]', name[:7])
subprocess.run(['focker', 'bootstrap', '--dry-run', '--tags', 'test-focker-bootstrap'])
name, sha256 = zfs_find('test-focker-bootstrap', focker_type='image')
basename = os.path.basename(name)
assert len(basename) >= 7
assert re.search('[a-f]', basename[:7])
assert len(sha256) == 64
assert name == sha256[:len(name)]
assert basename == sha256[:len(basename)]
assert zfs_exists_snapshot_sha256(sha256)
subprocess.check_output(['zfs', 'destroy', '-r', '-f', name])

Ładowanie…
Anuluj
Zapisz