Resolve actions conflicts and delete unwatned files

Bump migrations and delete some files

Resolve remaining conflicts

Fix requirements

Flake8 fixes

Prefer devel changes for schema

Use correct versions

Remove sso connected stuff

Update to modern actions and collection fixes

Remove unwated alias

Version problems in actions

Fix more versioning problems

Update warning string

Messed it up again

Shorten exception

More removals

Remove pbr license

Remove tests deleted in devel

Remove unexpected files

Remove some content missed in the rebase

Use sleep_task from devel

Restore devel live conftest file

Add in settings that got missed

Prefer devel version of collection test

Finish repairing .github path

Remove unintended test file duplication

Undo more unintended file additions

.github/actions/awx_devel_image/action.yml

@@ -24,31 +24,9 @@ runs:
       run: |
         echo "${{ inputs.github-token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-<<<<<<< HEAD
     - uses: ./.github/actions/setup-ssh-agent
       with:
         ssh-private-key: ${{ inputs.private-github-key }}
-=======
-    - name: Generate placeholder SSH private key if SSH auth for private repos is not needed
-      id: generate_key
-      shell: bash
-      run: |
-        if [[ -z "${{ inputs.private-github-key }}" ]]; then
-          ssh-keygen -t ed25519 -C "github-actions" -N "" -f ~/.ssh/id_ed25519
-          echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
-          cat ~/.ssh/id_ed25519 >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-        else
-          echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
-          echo "${{ inputs.private-github-key }}" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Add private GitHub key to SSH agent
-      uses: webfactory/ssh-agent@v0.9.0
-      with:
-        ssh-private-key: ${{ steps.generate_key.outputs.SSH_PRIVATE_KEY }}
->>>>>>> tower/test_stable-2.6
 
     - name: Pre-pull latest devel image to warm cache
       shell: bash

.github/actions/run_awx_devel/action.yml

@@ -36,7 +36,7 @@ runs:
 
     - name: Upgrade ansible-core
       shell: bash
-      run: python3 -m pip install --upgrade 'ansible-core<2.18.0'
+      run: python3 -m pip install --upgrade ansible-core
 
     - name: Install system deps
       shell: bash

.github/workflows/ci.yml

@@ -39,16 +39,12 @@ jobs:
             command: /start_tests.sh test_collection_all
             coverage-upload-name: "awx-collection"
           - name: api-schema
-<<<<<<< HEAD
             command: >-
               /start_tests.sh detect-schema-change SCHEMA_DIFF_BASE_BRANCH=${{
                 github.event.pull_request.base.ref || github.ref_name
               }}
             coverage-upload-name: ""
 
-=======
-            command: /start_tests.sh detect-schema-change SCHEMA_DIFF_BASE_BRANCH=${{ github.event.pull_request.base.ref }}
->>>>>>> tower/test_stable-2.6
     steps:
       - uses: actions/checkout@v4
         with:
@@ -134,15 +130,9 @@ jobs:
         with:
           show-progress: false
 
-<<<<<<< HEAD
       - uses: ./.github/actions/setup-python
         with:
           python-version: '3.x'
-=======
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
->>>>>>> tower/test_stable-2.6
 
       - uses: ./.github/actions/run_awx_devel
         id: awx
@@ -153,14 +143,11 @@ jobs:
 
       - name: Run live dev env tests
         run: docker exec tools_awx_1 /bin/bash -c "make live_test"
-<<<<<<< HEAD
 
       - uses: ./.github/actions/upload_awx_devel_logs
         if: always()
         with:
           log-filename: live-tests.log
-=======
->>>>>>> tower/test_stable-2.6
 
   awx-operator:
     runs-on: ubuntu-latest
@@ -185,34 +172,15 @@ jobs:
           repository: ansible/awx-operator
           path: awx-operator
 
-      - uses: ./awx/.github/actions/setup-python
+      - name: Setup python, referencing action at awx relative path
+        uses: ./awx/.github/actions/setup-python
         with:
-          working-directory: awx
+          python-version: '3.x'
 
       - name: Install playbook dependencies
         run: |
           python3 -m pip install docker
 
-      - name: Generate placeholder SSH private key if SSH auth for private repos is not needed
-        id: generate_key
-        shell: bash
-        run: |
-          if [[ -z "${{ secrets.PRIVATE_GITHUB_KEY }}" ]]; then
-            ssh-keygen -t ed25519 -C "github-actions" -N "" -f ~/.ssh/id_ed25519
-            echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
-            cat ~/.ssh/id_ed25519 >> $GITHUB_OUTPUT
-            echo "EOF" >> $GITHUB_OUTPUT
-          else
-            echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
-            echo "${{ secrets.PRIVATE_GITHUB_KEY }}" >> $GITHUB_OUTPUT
-            echo "EOF" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Add private GitHub key to SSH agent
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ steps.generate_key.outputs.SSH_PRIVATE_KEY }}
-
       - name: Build AWX image
         working-directory: awx
         run: |
@@ -311,15 +279,9 @@ jobs:
         with:
           show-progress: false
 
-<<<<<<< HEAD
       - uses: ./.github/actions/setup-python
         with:
           python-version: '3.x'
-=======
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
->>>>>>> tower/test_stable-2.6
 
       - uses: ./.github/actions/run_awx_devel
         id: awx
@@ -395,18 +357,12 @@ jobs:
           persist-credentials: false
           show-progress: false
 
-<<<<<<< HEAD
       - uses: ./.github/actions/setup-python
         with:
           python-version: '3.x'
-=======
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
->>>>>>> tower/test_stable-2.6
 
       - name: Upgrade ansible-core
-        run: python3 -m pip install --upgrade "ansible-core<2.19"
+        run: python3 -m pip install --upgrade ansible-core
 
       - name: Download coverage artifacts
         uses: actions/download-artifact@v4

.github/workflows/devel_images.yml

@@ -70,31 +70,9 @@ jobs:
           make ui
         if: matrix.build-targets.image-name == 'awx'
 
-<<<<<<< HEAD
       - uses: ./.github/actions/setup-ssh-agent
         with:
           ssh-private-key: ${{ secrets.PRIVATE_GITHUB_KEY }}
-=======
-      - name: Generate placeholder SSH private key if SSH auth for private repos is not needed
-        id: generate_key
-        shell: bash
-        run: |
-          if [[ -z "${{ secrets.PRIVATE_GITHUB_KEY }}" ]]; then
-            ssh-keygen -t ed25519 -C "github-actions" -N "" -f ~/.ssh/id_ed25519
-            echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
-            cat ~/.ssh/id_ed25519 >> $GITHUB_OUTPUT
-            echo "EOF" >> $GITHUB_OUTPUT
-          else
-            echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
-            echo "${{ secrets.PRIVATE_GITHUB_KEY }}" >> $GITHUB_OUTPUT
-            echo "EOF" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Add private GitHub key to SSH agent
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ steps.generate_key.outputs.SSH_PRIVATE_KEY }}
->>>>>>> tower/test_stable-2.6
 
       - name: Build and push AWX devel images
         run: |

.github/workflows/docs.yml

@@ -12,11 +12,7 @@ jobs:
         with:
           show-progress: false
 
-<<<<<<< HEAD
       - uses: ./.github/actions/setup-python
-=======
-      - uses: actions/setup-python@v5
->>>>>>> tower/test_stable-2.6
         with:
           python-version: '3.x'
 

.github/workflows/label_pr.yml

@@ -33,11 +33,7 @@ jobs:
         with:
           show-progress: false
 
-<<<<<<< HEAD
       - uses: ./.github/actions/setup-python
-=======
-      - uses: actions/setup-python@v5
->>>>>>> tower/test_stable-2.6
         with:
           python-version: '3.x'
 

.github/workflows/upload_schema.yml

@@ -24,64 +24,23 @@ jobs:
         with:
           show-progress: false
 
-<<<<<<< HEAD
       - uses: ./.github/actions/setup-python
-=======
-      - name: Set lower case owner name
-        shell: bash
-        run: echo "OWNER_LC=${OWNER,,}" >> $GITHUB_ENV
-        env:
-          OWNER: '${{ github.repository_owner }}'
-
-      - name: Get python version from Makefile
-        run: echo py_version=`make PYTHON_VERSION` >> $GITHUB_ENV
-
-      - name: Install python ${{ env.py_version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ env.py_version }}
->>>>>>> tower/test_stable-2.6
 
       - name: Log in to registry
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-<<<<<<< HEAD
       - uses: ./.github/actions/setup-ssh-agent
         with:
           ssh-private-key: ${{ secrets.PRIVATE_GITHUB_KEY }}
 
       - name: Pre-pull image to warm build cache
-=======
-      - name: Pre-pull latest devel image to warm cache
-        shell: bash
->>>>>>> tower/test_stable-2.6
         run: |
           DEV_DOCKER_TAG_BASE=ghcr.io/${OWNER_LC} \
           COMPOSE_TAG=${{ github.base_ref || github.ref_name }} \
           docker pull -q `make print-DEVEL_IMAGE_NAME`
         continue-on-error: true
 
-      - name: Generate placeholder SSH private key if SSH auth for private repos is not needed
-        id: generate_key
-        shell: bash
-        run: |
-          if [[ -z "${{ secrets.PRIVATE_GITHUB_KEY }}" ]]; then
-            ssh-keygen -t ed25519 -C "github-actions" -N "" -f ~/.ssh/id_ed25519
-            echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
-            cat ~/.ssh/id_ed25519 >> $GITHUB_OUTPUT
-            echo "EOF" >> $GITHUB_OUTPUT
-          else
-            echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
-            echo "${{ secrets.PRIVATE_GITHUB_KEY }}" >> $GITHUB_OUTPUT
-            echo "EOF" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Add private GitHub key to SSH agent
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ steps.generate_key.outputs.SSH_PRIVATE_KEY }}
-
       - name: Build image
         run: |
           DEV_DOCKER_TAG_BASE=ghcr.io/${OWNER_LC} \