refine strategy to spot ip address, keep on calling guest_ipv4

[build.git] / pkgs.py

diff --git a/pkgs.py b/pkgs.py
index 24b49b7..3291dbe 100755 (executable)
--- a/pkgs.py
+++ b/pkgs.py
@@ -35,14 +35,17 @@ from optparse import OptionParser
 import re
 
 default_arch = 'x86_64'
-known_arch = ['i386', 'i686', 'x86_64']
-default_fcdistro = 'f29'
+known_archs = ['i386', 'i686', 'x86_64']
+default_fcdistro = 'f39'
 known_fcdistros = [
     'centos5', 'centos6',
     # oldies but we have references to that in the pkgs files
-    'f8', 'f10', 'f12', 'f14', 'f16', 'f18', 'f20', 'f21', 'f22', 'f23', 'f24',
-    # these ones are still relevant
-    'f25', 'f27', 'f29',
+    'f8', 'f10', 'f12', 'f14', 'f16', 'f18',
+    'f20', 'f21', 'f22', 'f23', 'f24', 'f25', 'f27',
+    # these ones are still relevant;
+    # f32 is mentioned to be able to use create-vms with that distro
+    # as we're running into issues to build a minimal f33 from a f29 host
+    'f29', 'f31', 'f32', 'f33', 'f35', 'f37', 'f39',
     # scientific linux
     'sl6',
     # debians
@@ -51,6 +54,8 @@ known_fcdistros = [
     'trusty',  # 14.04 LTS
     'xenial',  # 16.04 LTS
     'bionic',  # 18.04 LTS
+    'focal',   # 20.04 LTS
+    'jammy',   # 22.04 LTS
 ]
 default_pldistro = 'onelab'
 
@@ -117,7 +122,7 @@ class PkgsParser:
     re_qualified += r'\s*'
     re_qualified += r'(?P<fcdistro>{re_ident}[0-9]+)'.format(re_ident=re_ident)
     re_qualified += r'\s*'
-    m_qualified = re.compile(r'\A{}\Z'.format(re_qualified))
+    m_qualified = re.compile(r'\A{re_qualified}\Z'.format(re_qualified=re_qualified))
 
     re_old = '[a-z]+[+-][a-z]+[0-9]+'
     m_old = re.compile(r'\A{}\Z'.format(re_old))
@@ -242,13 +247,13 @@ def main ():
         sys.exit(1)
     keyword = args[0]
     inputs = args[1:]
-    if not options.arch in known_arch:
+    if options.arch not in known_archs:
         print('Unsupported arch', options.arch, file=stderr)
         parser.print_help(file=stderr)
         sys.exit(1)
     if options.arch == 'i686':
         options.arch = 'i386'
-    if not options.fcdistro in known_fcdistros:
+    if options.fcdistro not in known_fcdistros:
         print('Unsupported fcdistro', options.fcdistro, file=stderr)
         parser.print_help(file=stderr)
         sys.exit(1)