AAP-52090 Synchronize branches

[AlanCoding]

SUMMARY

Update devel to reduce branch drift.

The merge method is "faked", which was:

# resolve only files that have NO stage-1 (i.e., no base) -> add/add conflicts
for f in $(git diff --name-only --diff-filter=U); do
  # list unmerged stages for this path; if there's no stage 1, it's add/add
  if ! git ls-files -u -- "$f" | awk '{print $3}' | grep -q '^1$'; then
    # pick one side for add/add; choose --theirs (incoming) or --ours (current)
    git checkout --theirs -- "$f"     # or: git checkout --ours -- "$f"
    git add -- "$f"
  fi
done

The commit before the branch point

cb2ad41

From #15427

ISSUE TYPE

• Bug, Docs Fix or other nominal change

COMPONENT NAME

• API

[AlanCoding]

Next, this is probably an obvious one

tests/dispatcherd/test_connection_recovery.py:9: in <module>
    from awx.main.tests.data.sleep_task import sleep_break_connection, advisory_lock_exception
E   ImportError: cannot import name 'sleep_break_connection' from 'awx.main.tests.data.sleep_task' (/awx_devel/awx/main/tests/data/sleep_task.py)

[fosterseth]

https://github.com/ansible/awx/pull/16092/files#diff-c0ac988bcf96b27bb1ae562fff68a68c38f4a7dc69937158dbd409879ac4b78aR599-R608

not sure why these lines didn't get removed, here is the commit c2c0f2b

---

it's now RESOLVED

[fosterseth]

not sure if policy as code is intended to be in awx

[fosterseth]

stood up aap-gateway/aap-dev alongside awx running with this branch and everything started successfully ✔️

[sonarqubecloud]

Quality Gate failed

Failed conditions
2 Security Hotspots

See analysis details on SonarQube Cloud