bringup: add semantics to start NixOS support

[kdevops-kpd]

Pull request for series with
subject: bringup: add semantics to start NixOS support
version: 1
url: https://patchwork.kernel.org/project/kdevops/list/?series=948517

[kdevops-kpd]

Upstream branch: 3521091
series: https://patchwork.kernel.org/project/kdevops/list/?series=948517
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/kdevops/list/?series=948517
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: bringup: add semantics to start NixOS support
Using index info to reconstruct a base tree...
M	kconfigs/Kconfig.kdevops
M	playbooks/roles/gen_nodes/tasks/main.yml
Falling back to patching base and 3-way merge...
Auto-merging playbooks/roles/gen_nodes/tasks/main.yml
CONFLICT (content): Merge conflict in playbooks/roles/gen_nodes/tasks/main.yml
Auto-merging kconfigs/Kconfig.kdevops
CONFLICT (content): Merge conflict in kconfigs/Kconfig.kdevops
Patch failed at 0001 bringup: add semantics to start NixOS support'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"'

conflict:

diff --cc kconfigs/Kconfig.kdevops
index 35e9758,685abd4..0000000
--- a/kconfigs/Kconfig.kdevops
+++ b/kconfigs/Kconfig.kdevops
@@@ -195,7 -196,4 +196,11 @@@ if KDEVOPS_SUPPORTS_LEGACY_KERNELC
  menu "Kernel continous integration configuration"
  source "kconfigs/Kconfig.kernel-ci"
  endmenu
++<<<<<<< HEAD
 +
 +menu "Ansible Configuration"
 +source "kconfigs/Kconfig.ansible_cfg"
 +endmenu
++=======
+ endif
++>>>>>>> bringup: add semantics to start NixOS support
diff --cc playbooks/roles/gen_nodes/tasks/main.yml
index d541dcb,7f5b64b..0000000
--- a/playbooks/roles/gen_nodes/tasks/main.yml
+++ b/playbooks/roles/gen_nodes/tasks/main.yml
@@@ -18,6 -18,23 +18,26 @@@
    command: "id -g -n"
    register: my_group
  
++<<<<<<< HEAD
++=======
+ - name: Create NixOS directory
+   ansible.builtin.file:
+     path: "{{ kdevops_nix_path }}"
+     state: directory
+   when: kdevops_enable_nixos|bool
+ 
+ - name: Generate NixOS devshell.nix
+   template:
+     src: devshell.nix.j2
+     dest: "{{ kdevops_nix_path }}"
+   when: kdevops_enable_nixos|bool
+ 
+ - name: Fail if kdevops_host_prefix contains a dash
+   fail:
+     msg: "Invalid kdevops_host_prefix '{{ kdevops_host_prefix }}'. The prefix cannot contain a dash ('-')."
+   when: kdevops_host_prefix is search("-")
+ 
++>>>>>>> bringup: add semantics to start NixOS support
  - name: Create guestfs directory
    ansible.builtin.file:
      path: "{{ guestfs_path }}"