oscontainer-deprecated-legacy-format: use runvm not nested containers

Author: jmarrero

src/cmd-upload-oscontainer-deprecated-legacy-format

@@ -104,23 +104,24 @@ digestfile = "tmp/oscontainer-digest"
 # We need to pass the auth file from the unpriv user to the root process
 cosa_argv = ['sudo', '--preserve-env=container,DISABLE_TLS_VERIFICATION,SSL_CERT_DIR,SSL_CERT_FILE,REGISTRY_AUTH_FILE,OSCONTAINER_CERT_DIR']
 authfile = os.environ.get("REGISTRY_AUTH_FILE", os.path.expanduser('~/.docker/config.json'))
-if not os.path.isfile(authfile):
-    raise SystemExit(f"Missing {authfile}")
-os.environ['REGISTRY_AUTH_FILE'] = authfile
-cosa_argv.extend(['/usr/lib/coreos-assembler/oscontainer.py', '--workdir=./tmp', 'build',  f"--from={args.from_image}"])
+#if not os.path.isfile(authfile):
+#    raise SystemExit(f"Missing {authfile}")
+#os.environ['REGISTRY_AUTH_FILE'] = authfile
+print("Entering vm to build oscontainer for build: {}".format(latest_build))
+arguments = ''
 for d in args.add_directory:
-    cosa_argv.append(f"--add-directory={d}")
-cosa_argv.append(f"--display-name={display_name}")
+    arguments = arguments + (f' --add-directory="{d}"')
+arguments = arguments + (f' --display-name="{display_name}"')
 if 'labeled-packages' in configyaml:
     pkgs = ' '.join(configyaml['labeled-packages'])
-    cosa_argv.append(f"--labeled-packages={pkgs}")
+    arguments = arguments + (f' --labeled-packages="{pkgs}"')
 if args.format is not None:
-    cosa_argv.append(f'--format={args.format}')
-subprocess.check_call(cosa_argv +
-    [f'--digestfile={digestfile}',
-        '--push', tmprepo,
-        meta['ostree-commit'],
-        osc_name_and_tag])
+    arguments = arguments + (f' --format="{args.format}"')
+
+print(arguments)
+#adding aguments failing
+cosa_argv.extend(['/bin/sh', '-c', f'. /usr/lib/coreos-assembler/cmdlib.sh; prepare_build && . /usr/lib/coreos-assembler/cmdlib.sh && runvm -- /usr/lib/coreos-assembler/oscontainer-deprecated-legacy-format.py --workdir=./tmp build --from={args.from_image} --digestfile={digestfile} --push {tmprepo} {ostree_commit} {osc_name_and_tag}'])
+subprocess.check_call(cosa_argv)
 
 with open(digestfile) as f:
     osc_digest = f.read().strip()

src/oscontainer-deprecated-legacy-format.py

@@ -279,9 +279,9 @@ def main():
         help="Push to registry",
         action='store_true')
     args = parser.parse_args()
-
+    print(args)
     labeled_pkgs = []
-    if args.labeled_packages is not None:
+    if hasattr(args, 'labeled_packages') and args.labeled_packages is not None:
         labeled_pkgs = args.labeled_packages.split()
 
     containers_storage = None

src/vmdeps.txt

@@ -20,6 +20,9 @@ selinux-policy selinux-policy-targeted policycoreutils
 # coreos-assembler
 python3 python3-gobject-base buildah podman skopeo iptables iptables-libs
 
+# legacy-oscontainer
+python3-pyyaml python3-botocore python3-flufl-lock python3-tenacity
+
 # luks
 cryptsetup
 # filesystems/storage