Move conf and comps to qubes-release

[fepitre]

QubesOS/qubes-issues#9254

[marmarek]

This doesn't work, I think relative_to does something else. Should be maybe:

Suggested change

	self.comps_path = self.comps_path.relative_to(
	self.get_sources_dir() / "qubes-release"
	self.comps_path = self.get_sources_dir() / "qubes-release" / self.comps_path

?
(and similar for kickstart)

[marmarek]

And also, later usage in update_parameters and in run might need a change too. It tries to copy_in into installer/comps (which might be okay?), but it will be problematic for kickstart that do include other files (that are not copied in anymore)

[fepitre]

For the include part, to be honest right now, I've no idea. If we need to resolve all the includes that's going to be fun

[codecov]

Codecov Report

Attention: Patch coverage is 84.00000% with 4 lines in your changes are missing coverage. Please review.

Project coverage is 77.40%. Comparing base (402d326) to head (8e9c204).
Report is 6 commits behind head on main.

Files	Patch %	Lines
qubesbuilder/plugins/installer/__init__.py	70.00%	3 Missing ⚠️
qubesbuilder/plugins/publish_rpm/__init__.py	50.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #113      +/-   ##
==========================================
+ Coverage   77.21%   77.40%   +0.18%     
==========================================
  Files          46       46              
  Lines        5004     5001       -3     
==========================================
+ Hits         3864     3871       +7     
+ Misses       1140     1130      -10     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[marmarek]

This fails with qubes executor:

Running installer stage: prep
Traceback (most recent call last):
  File "/usr/local/etc/qubes-rpc/qubesbuilder.FileCopyIn", line 74, in <module>
    main()
  File "/usr/local/etc/qubes-rpc/qubesbuilder.FileCopyIn", line 70, in main
    shutil.move(f"/builder/incoming/{bn}", dn)
  File "/usr/lib64/python3.12/shutil.py", line 884, in move
    raise Error("Destination path '%s' already exists" % real_dst)
shutil.Error: Destination path '/builder/sources/qubes-release/conf/iso-online-testing.ks' already exists
Error: host-fedora-37.x86_64: Failed to prepare installer: .
Traceback (most recent call last):
  File "/home/user/qubes-builderv2/qubesbuilder/executors/qubes.py", line 90, in copy_in
    subprocess.run(copy_in_cmd, check=True)
  File "/usr/lib64/python3.12/subprocess.py", line 571, in run
    raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['/usr/lib/qubes/qrexec-client-vm', '--', 'disp4931', 'qubesbuilder.FileCopyIn+-2Fbuilder-2Fsources-2Fqubes--release-2Fconf-2Fiso--online--testing.ks', '/usr/lib/qubes/qfile-agent', '/home/user/qubes-builderv2/artifacts43/sources/qubes-release/conf/iso-online-testing.ks']' returned non-zero exit status 1.

The above exception was the direct cause of the following exception:

Traceback (most recent call last):
  File "/home/user/qubes-builderv2/qubesbuilder/plugins/installer/__init__.py", line 457, in run
    executor.run(
  File "/home/user/qubes-builderv2/qubesbuilder/executors/qubes.py", line 251, in run
    self.copy_in(dispvm, source_path=src_in, destination_dir=dst_in)
  File "/home/user/qubes-builderv2/qubesbuilder/executors/qubes.py", line 95, in copy_in
    raise ExecutorError from e
qubesbuilder.executors.ExecutorError

The above exception was the direct cause of the following exception:

Traceback (most recent call last):
  File "/home/user/qubes-builderv2/qubesbuilder/cli/cli_base.py", line 65, in __call__
    return self.main(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.12/site-packages/click/core.py", line 1055, in main
    rv = self.invoke(ctx)
         ^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.12/site-packages/click/core.py", line 1657, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.12/site-packages/click/core.py", line 1688, in invoke
    rv.append(sub_ctx.command.invoke(sub_ctx))
              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.12/site-packages/click/core.py", line 1404, in invoke
    return ctx.invoke(self.callback, **ctx.params)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.12/site-packages/click/core.py", line 760, in invoke
    return __callback(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.12/site-packages/click/decorators.py", line 38, in new_func
    return f(get_current_context().obj, *args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/user/qubes-builderv2/qubesbuilder/cli/cli_installer.py", line 51, in _all_installer_stage
    _installer_stage(
  File "/home/user/qubes-builderv2/qubesbuilder/cli/cli_installer.py", line 44, in _installer_stage
    installer_plugin.run(stage=stage_name, iso_timestamp=iso_timestamp)
  File "/home/user/qubes-builderv2/qubesbuilder/plugins/installer/__init__.py", line 466, in run
    raise InstallerError(msg) from e
qubesbuilder.plugins.installer.InstallerError: host-fedora-37.x86_64: Failed to prepare installer: .

[marmarek]

I set:

iso:
  kickstart: conf/iso-online-testing.ks