cmdlib: specify repo path for import_oci_archive()

Somehow hardcoding `tmp/repo` here isn't actually working. Here's
what happens if I blow away my `tmp/` and then attempt to do another
operation (like `cosa osbuild qemu`):

```
Wrote: ostree-unverified-image:oci-archive:/srv/tmp/cosa-import-op0cg6_c/out.ociarchive => e202ee3cb8a2a8d814bd2b325cdef5500459fd2381d4fa766cd15ab730ae0e80
2273 metadata, 8746 content objects imported; 1.2 GB content written
1471 metadata, 1534 content objects imported; 133.6 MB content written
Imported OCI image as build 42.20250821.dev.0
Pruning build 44.20250826.dev.0
Deleting 5 blob refs
[coreos-assembler]$
[coreos-assembler]$ rm -rf tmp/*
[coreos-assembler]$ cosa osbuild qemu
Config commit: e5f88e72120b3f89cf2c4d81b45bbe791d9bd79d
Using manifest: /srv/src/config/manifest.yaml
Will build qemu
Extracting e202ee3cb8a2a8d814bd2b325cdef5500459fd2381d4fa766cd15ab730ae0e80
layers already present: 0; layers needed: 66 (975.9 MB)
3725 metadata, 21742 content objects imported; 1.7 GB content written                                                                                                                       3
2603 metadata, 10508 content objects imported; 250.5 MB content written
error: No such metadata object e202ee3cb8a2a8d814bd2b325cdef5500459fd2381d4fa766cd15ab730ae0e80.commit
Traceback (most recent call last):
  File "<string>", line 10, in <module>
    cmdlib.import_ostree_commit(workdir, builddir, buildmeta, extract_json=('1' == '1'))
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/coreos-assembler/cosalib/cmdlib.py", line 362, in import_ostree_commit
    extract_image_json(workdir, commit)
    ~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^
  File "/usr/lib/coreos-assembler/cosalib/cmdlib.py", line 272, in extract_image_json
    raise Exception("Failed to extract image.json")
Exception: Failed to extract image.json
failed to execute cmd-osbuild: exit status 1
```

Let's just have the caller explicitly tell us the path to the repo
we want to import into is.

Author: dustymabe

src/cmd-import

@@ -47,7 +47,7 @@ def main():
         tmp_oci_manifest = generate_oci_manifest(args, tmpd)
 
         # import into the tmp/repo to get the ostree-commit but also so it's cached
-        ostree_commit = import_oci_archive(tmpd, tmp_oci_archive, buildid)
+        ostree_commit = import_oci_archive(tmpd, 'tmp/repo', tmp_oci_archive, buildid)
 
         # artificially recreate generated lockfile
         tmp_lockfile = generate_lockfile(tmpd, ostree_commit)

src/cosalib/cmdlib.py

@@ -337,7 +337,7 @@ def import_ostree_commit(workdir, buildpath, buildmeta, extract_json=True, parti
         if was_oci_imported:
             # This was initially imported using `cosa import`. Go through that
             # path again because it's not an encapsulated commit.
-            import_oci_archive(tmpdir, tarfile, buildmeta['buildid'])
+            import_oci_archive(tmpdir, repo, tarfile, buildmeta['buildid'])
         elif os.environ.get('COSA_PRIVILEGED', '') == '1':
             build_repo = os.path.join(repo, '../../cache/repo-build')
             # note: this actually is the same as `container unencapsulate` and
@@ -362,46 +362,46 @@ def import_ostree_commit(workdir, buildpath, buildmeta, extract_json=True, parti
             extract_image_json(workdir, commit)
 
 
-def import_oci_archive(parent_tmpd, ociarchive, ref):
+def import_oci_archive(parent_tmpd, repo, ociarchive, ref):
     '''
-    Imports layered/non-encapsulated OCI archive into the tmp/repo. Returns
-    the OSTree commit that was imported.
+    Imports layered/non-encapsulated OCI archive into the repo
+    (usually tmp/repo). Returns the OSTree commit that was imported.
     '''
-    with tempfile.TemporaryDirectory(dir=parent_tmpd) as tmpd:
-        subprocess.check_call(['ostree', 'init', '--repo', tmpd, '--mode=bare-user'])
+    with tempfile.TemporaryDirectory(dir=parent_tmpd) as tmprepo:
+        subprocess.check_call(['ostree', 'init', '--repo', tmprepo, '--mode=bare-user'])
 
         # Init tmp/repo in case it doesn't exist.
         # If it exists, no problem. It's idempotent
-        subprocess.check_call(['ostree', 'init', '--repo', 'tmp/repo', '--mode=archive'])
+        subprocess.check_call(['ostree', 'init', '--repo', repo, '--mode=archive'])
 
         # import all the blob refs for more efficient import into bare-user repo
-        blob_refs = subprocess.check_output(['ostree', 'refs', '--repo', 'tmp/repo',
+        blob_refs = subprocess.check_output(['ostree', 'refs', '--repo', repo,
                                              '--list', 'ostree/container/blob'],
                                             encoding='utf-8').splitlines()
         if len(blob_refs) > 0:
-            subprocess.check_call(['ostree', 'pull-local', '--repo', tmpd, 'tmp/repo'] + blob_refs)
+            subprocess.check_call(['ostree', 'pull-local', '--repo', tmprepo, repo] + blob_refs)
 
-        subprocess.check_call(['ostree', 'container', 'image', 'pull', tmpd,
+        subprocess.check_call(['ostree', 'container', 'image', 'pull', tmprepo,
                                f'ostree-unverified-image:oci-archive:{ociarchive}'])
 
         # awkwardly work around the fact that there is no --write-ref equivalent
         # XXX: we can make this better once we can rely on --ostree-digestfile
         # https://github.com/bootc-dev/bootc/pull/1421
-        refs = subprocess.check_output(['ostree', 'refs', '--repo', tmpd,
+        refs = subprocess.check_output(['ostree', 'refs', '--repo', tmprepo,
                                         '--list', 'ostree/container/image'],
                                        encoding='utf-8').splitlines()
         assert len(refs) == 1
-        subprocess.check_call(['ostree', 'refs', '--repo', tmpd, refs[0], '--create', ref])
-        subprocess.check_call(['ostree', 'refs', '--repo', 'tmp/repo', ref, '--delete'])
-        subprocess.check_call(['ostree', 'pull-local', '--repo', 'tmp/repo', tmpd, ref])
+        subprocess.check_call(['ostree', 'refs', '--repo', tmprepo, refs[0], '--create', ref])
+        subprocess.check_call(['ostree', 'refs', '--repo', repo, ref, '--delete'])
+        subprocess.check_call(['ostree', 'pull-local', '--repo', repo, tmprepo, ref])
 
         # export back all the blob refs for more efficient imports of next builds
-        blob_refs = subprocess.check_output(['ostree', 'refs', '--repo', tmpd,
+        blob_refs = subprocess.check_output(['ostree', 'refs', '--repo', tmprepo,
                                              '--list', 'ostree/container/blob'],
                                             encoding='utf-8').splitlines()
-        subprocess.check_call(['ostree', 'pull-local', '--repo', 'tmp/repo', tmpd] + blob_refs)
+        subprocess.check_call(['ostree', 'pull-local', '--repo', repo, tmprepo] + blob_refs)
 
-    ostree_commit = subprocess.check_output(['ostree', 'rev-parse', '--repo', 'tmp/repo', ref], encoding='utf-8').strip()
+    ostree_commit = subprocess.check_output(['ostree', 'rev-parse', '--repo', repo, ref], encoding='utf-8').strip()
     return ostree_commit