Merge remote-tracking branch 'tower/test_stable-2.6' into merge_26_2

.github/actions/awx_devel_image/action.yml

@@ -24,9 +24,31 @@ 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
+      run: python3 -m pip install --upgrade 'ansible-core<2.18.0'
 
     - name: Install system deps
       shell: bash

.github/workflows/ci.yml

@@ -39,12 +39,16 @@ 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:
@@ -130,9 +134,15 @@ 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
@@ -143,11 +153,14 @@ 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
@@ -180,6 +193,26 @@ jobs:
         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: |
@@ -278,9 +311,15 @@ 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
@@ -356,12 +395,18 @@ 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
+        run: python3 -m pip install --upgrade "ansible-core<2.19"
 
       - name: Download coverage artifacts
         uses: actions/download-artifact@v4

.github/workflows/devel_images.yml

@@ -10,6 +10,7 @@ on:
       - devel
       - release_*
       - feature_*
+      - stable-*
 jobs:
   push-development-images:
     runs-on: ubuntu-latest
@@ -69,9 +70,31 @@ 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,7 +12,11 @@ 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/feature_branch_sync.yml

@@ -0,0 +1,35 @@
+name: Rebase release_4.6-next and stable-2.6
+
+on:
+  push:
+    branches:
+      - release_4.6
+  workflow_dispatch:
+    # Allows manual triggering of the workflow from the GitHub UI
+
+jobs:
+  rebase:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout stable-2.6 branch
+        uses: actions/checkout@v4
+        with:
+          ref: stable-2.6
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Fetch release_4.6 branch for rebase
+        run: git fetch origin release_4.6:release_4.6
+
+      - name: Attempt Rebase release_4.6 into stable-2.6
+        id: rebase_attempt
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git checkout stable-2.6
+          git rebase release_4.6
+
+      - name: Force Push Rebased stable-2.6 Branch
+        run: |
+          git push --force origin stable-2.6

.github/workflows/label_pr.yml

@@ -33,7 +33,11 @@ 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

@@ -11,6 +11,7 @@ on:
       - devel
       - release_**
       - feature_**
+      - stable-**
 jobs:
   push:
     runs-on: ubuntu-latest
@@ -23,28 +24,76 @@ 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: |
-          docker pull -q ghcr.io/${{ github.repository_owner }}/awx_devel:${GITHUB_REF##*/} || :
+          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/${{ github.repository_owner }} COMPOSE_TAG=${GITHUB_REF##*/} make docker-compose-build
+          DEV_DOCKER_TAG_BASE=ghcr.io/${OWNER_LC} \
+          COMPOSE_TAG=${{ github.base_ref || github.ref_name }} \
+          make docker-compose-build
 
       - name: Generate API Schema
         run: |
+          DEV_DOCKER_TAG_BASE=ghcr.io/${OWNER_LC} \
+          COMPOSE_TAG=${{ github.base_ref || github.ref_name }} \
           docker run -u $(id -u) --rm -v ${{ github.workspace }}:/awx_devel/:Z \
-            --workdir=/awx_devel ghcr.io/${{ github.repository_owner }}/awx_devel:${GITHUB_REF##*/} /start_tests.sh genschema
+            --workdir=/awx_devel `make print-DEVEL_IMAGE_NAME` /start_tests.sh genschema
 
       - name: Upload API Schema
         env: