Skip to content

Commit 8fb6a3a

Browse files
AlanCodingAlanCoding
committed
Merge remote-tracking branch 'tower/test_stable-2.6' into merge_26_2
2 parents 51eb109 + 7dc4f14 commit 8fb6a3a

File tree

127 files changed

+14455
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+14455
-345
lines changed

‎.github/actions/awx_devel_image/action.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,31 @@ runs:
2424
run: |
2525
echo "${{ inputs.github-token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
2626
27+
<<<<<<< HEAD
2728
- uses: ./.github/actions/setup-ssh-agent
2829
with:
2930
ssh-private-key: ${{ inputs.private-github-key }}
31+
=======
32+
- name: Generate placeholder SSH private key if SSH auth for private repos is not needed
33+
id: generate_key
34+
shell: bash
35+
run: |
36+
if [[ -z "${{ inputs.private-github-key }}" ]]; then
37+
ssh-keygen -t ed25519 -C "github-actions" -N "" -f ~/.ssh/id_ed25519
38+
echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
39+
cat ~/.ssh/id_ed25519 >> $GITHUB_OUTPUT
40+
echo "EOF" >> $GITHUB_OUTPUT
41+
else
42+
echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
43+
echo "${{ inputs.private-github-key }}" >> $GITHUB_OUTPUT
44+
echo "EOF" >> $GITHUB_OUTPUT
45+
fi
46+
47+
- name: Add private GitHub key to SSH agent
48+
uses: webfactory/[email protected]
49+
with:
50+
ssh-private-key: ${{ steps.generate_key.outputs.SSH_PRIVATE_KEY }}
51+
>>>>>>> tower/test_stable-2.6
3052

3153
- name: Pre-pull latest devel image to warm cache
3254
shell: bash

‎.github/actions/run_awx_devel/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ runs:
3636

3737
- name: Upgrade ansible-core
3838
shell: bash
39-
run: python3 -m pip install --upgrade ansible-core
39+
run: python3 -m pip install --upgrade 'ansible-core<2.18.0'
4040

4141
- name: Install system deps
4242
shell: bash

‎.github/workflows/ci.yml‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,16 @@ jobs:
3939
command: /start_tests.sh test_collection_all
4040
coverage-upload-name: "awx-collection"
4141
- name: api-schema
42+
<<<<<<< HEAD
4243
command: >-
4344
/start_tests.sh detect-schema-change SCHEMA_DIFF_BASE_BRANCH=${{
4445
github.event.pull_request.base.ref || github.ref_name
4546
}}
4647
coverage-upload-name: ""
4748

49+
=======
50+
command: /start_tests.sh detect-schema-change SCHEMA_DIFF_BASE_BRANCH=${{ github.event.pull_request.base.ref }}
51+
>>>>>>> tower/test_stable-2.6
4852
steps:
4953
- uses: actions/checkout@v4
5054
with:
@@ -130,9 +134,15 @@ jobs:
130134
with:
131135
show-progress: false
132136

137+
<<<<<<< HEAD
133138
- uses: ./.github/actions/setup-python
134139
with:
135140
python-version: '3.x'
141+
=======
142+
- uses: actions/setup-python@v5
143+
with:
144+
python-version: '3.12'
145+
>>>>>>> tower/test_stable-2.6
136146

137147
- uses: ./.github/actions/run_awx_devel
138148
id: awx
@@ -143,11 +153,14 @@ jobs:
143153

144154
- name: Run live dev env tests
145155
run: docker exec tools_awx_1 /bin/bash -c "make live_test"
156+
<<<<<<< HEAD
146157

147158
- uses: ./.github/actions/upload_awx_devel_logs
148159
if: always()
149160
with:
150161
log-filename: live-tests.log
162+
=======
163+
>>>>>>> tower/test_stable-2.6
151164

152165
awx-operator:
153166
runs-on: ubuntu-latest
@@ -180,6 +193,26 @@ jobs:
180193
run: |
181194
python3 -m pip install docker
182195
196+
- name: Generate placeholder SSH private key if SSH auth for private repos is not needed
197+
id: generate_key
198+
shell: bash
199+
run: |
200+
if [[ -z "${{ secrets.PRIVATE_GITHUB_KEY }}" ]]; then
201+
ssh-keygen -t ed25519 -C "github-actions" -N "" -f ~/.ssh/id_ed25519
202+
echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
203+
cat ~/.ssh/id_ed25519 >> $GITHUB_OUTPUT
204+
echo "EOF" >> $GITHUB_OUTPUT
205+
else
206+
echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
207+
echo "${{ secrets.PRIVATE_GITHUB_KEY }}" >> $GITHUB_OUTPUT
208+
echo "EOF" >> $GITHUB_OUTPUT
209+
fi
210+
211+
- name: Add private GitHub key to SSH agent
212+
uses: webfactory/[email protected]
213+
with:
214+
ssh-private-key: ${{ steps.generate_key.outputs.SSH_PRIVATE_KEY }}
215+
183216
- name: Build AWX image
184217
working-directory: awx
185218
run: |
@@ -278,9 +311,15 @@ jobs:
278311
with:
279312
show-progress: false
280313

314+
<<<<<<< HEAD
281315
- uses: ./.github/actions/setup-python
282316
with:
283317
python-version: '3.x'
318+
=======
319+
- uses: actions/setup-python@v5
320+
with:
321+
python-version: '3.12'
322+
>>>>>>> tower/test_stable-2.6
284323

285324
- uses: ./.github/actions/run_awx_devel
286325
id: awx
@@ -356,12 +395,18 @@ jobs:
356395
persist-credentials: false
357396
show-progress: false
358397

398+
<<<<<<< HEAD
359399
- uses: ./.github/actions/setup-python
360400
with:
361401
python-version: '3.x'
402+
=======
403+
- uses: actions/setup-python@v5
404+
with:
405+
python-version: '3.12'
406+
>>>>>>> tower/test_stable-2.6
362407

363408
- name: Upgrade ansible-core
364-
run: python3 -m pip install --upgrade ansible-core
409+
run: python3 -m pip install --upgrade "ansible-core<2.19"
365410

366411
- name: Download coverage artifacts
367412
uses: actions/download-artifact@v4

‎.github/workflows/devel_images.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- devel
1111
- release_*
1212
- feature_*
13+
- stable-*
1314
jobs:
1415
push-development-images:
1516
runs-on: ubuntu-latest
@@ -69,9 +70,31 @@ jobs:
6970
make ui
7071
if: matrix.build-targets.image-name == 'awx'
7172

73+
<<<<<<< HEAD
7274
- uses: ./.github/actions/setup-ssh-agent
7375
with:
7476
ssh-private-key: ${{ secrets.PRIVATE_GITHUB_KEY }}
77+
=======
78+
- name: Generate placeholder SSH private key if SSH auth for private repos is not needed
79+
id: generate_key
80+
shell: bash
81+
run: |
82+
if [[ -z "${{ secrets.PRIVATE_GITHUB_KEY }}" ]]; then
83+
ssh-keygen -t ed25519 -C "github-actions" -N "" -f ~/.ssh/id_ed25519
84+
echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
85+
cat ~/.ssh/id_ed25519 >> $GITHUB_OUTPUT
86+
echo "EOF" >> $GITHUB_OUTPUT
87+
else
88+
echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
89+
echo "${{ secrets.PRIVATE_GITHUB_KEY }}" >> $GITHUB_OUTPUT
90+
echo "EOF" >> $GITHUB_OUTPUT
91+
fi
92+
93+
- name: Add private GitHub key to SSH agent
94+
uses: webfactory/[email protected]
95+
with:
96+
ssh-private-key: ${{ steps.generate_key.outputs.SSH_PRIVATE_KEY }}
97+
>>>>>>> tower/test_stable-2.6
7598

7699
- name: Build and push AWX devel images
77100
run: |

‎.github/workflows/docs.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ jobs:
1212
with:
1313
show-progress: false
1414

15+
<<<<<<< HEAD
1516
- uses: ./.github/actions/setup-python
17+
=======
18+
- uses: actions/setup-python@v5
19+
>>>>>>> tower/test_stable-2.6
1620
with:
1721
python-version: '3.x'
1822

‎.github/workflows/feature_branch_sync.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Rebase release_4.6-next and stable-2.6
2+
3+
on:
4+
push:
5+
branches:
6+
- release_4.6
7+
workflow_dispatch:
8+
# Allows manual triggering of the workflow from the GitHub UI
9+
10+
jobs:
11+
rebase:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: write
15+
steps:
16+
- name: Checkout stable-2.6 branch
17+
uses: actions/checkout@v4
18+
with:
19+
ref: stable-2.6
20+
token: ${{ secrets.GITHUB_TOKEN }}
21+
22+
- name: Fetch release_4.6 branch for rebase
23+
run: git fetch origin release_4.6:release_4.6
24+
25+
- name: Attempt Rebase release_4.6 into stable-2.6
26+
id: rebase_attempt
27+
run: |
28+
git config user.name "GitHub Actions"
29+
git config user.email "github-actions[bot]@users.noreply.github.com"
30+
git checkout stable-2.6
31+
git rebase release_4.6
32+
33+
- name: Force Push Rebased stable-2.6 Branch
34+
run: |
35+
git push --force origin stable-2.6

‎.github/workflows/label_pr.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ jobs:
3333
with:
3434
show-progress: false
3535

36+
<<<<<<< HEAD
3637
- uses: ./.github/actions/setup-python
38+
=======
39+
- uses: actions/setup-python@v5
40+
>>>>>>> tower/test_stable-2.6
3741
with:
3842
python-version: '3.x'
3943

‎.github/workflows/upload_schema.yml‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- devel
1212
- release_**
1313
- feature_**
14+
- stable-**
1415
jobs:
1516
push:
1617
runs-on: ubuntu-latest
@@ -23,28 +24,76 @@ jobs:
2324
with:
2425
show-progress: false
2526

27+
<<<<<<< HEAD
2628
- uses: ./.github/actions/setup-python
29+
=======
30+
- name: Set lower case owner name
31+
shell: bash
32+
run: echo "OWNER_LC=${OWNER,,}" >> $GITHUB_ENV
33+
env:
34+
OWNER: '${{ github.repository_owner }}'
35+
36+
- name: Get python version from Makefile
37+
run: echo py_version=`make PYTHON_VERSION` >> $GITHUB_ENV
38+
39+
- name: Install python ${{ env.py_version }}
40+
uses: actions/setup-python@v4
41+
with:
42+
python-version: ${{ env.py_version }}
43+
>>>>>>> tower/test_stable-2.6
2744

2845
- name: Log in to registry
2946
run: |
3047
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
3148
49+
<<<<<<< HEAD
3250
- uses: ./.github/actions/setup-ssh-agent
3351
with:
3452
ssh-private-key: ${{ secrets.PRIVATE_GITHUB_KEY }}
3553

3654
- name: Pre-pull image to warm build cache
55+
=======
56+
- name: Pre-pull latest devel image to warm cache
57+
shell: bash
58+
>>>>>>> tower/test_stable-2.6
3759
run: |
38-
docker pull -q ghcr.io/${{ github.repository_owner }}/awx_devel:${GITHUB_REF##*/} || :
60+
DEV_DOCKER_TAG_BASE=ghcr.io/${OWNER_LC} \
61+
COMPOSE_TAG=${{ github.base_ref || github.ref_name }} \
62+
docker pull -q `make print-DEVEL_IMAGE_NAME`
63+
continue-on-error: true
64+
65+
- name: Generate placeholder SSH private key if SSH auth for private repos is not needed
66+
id: generate_key
67+
shell: bash
68+
run: |
69+
if [[ -z "${{ secrets.PRIVATE_GITHUB_KEY }}" ]]; then
70+
ssh-keygen -t ed25519 -C "github-actions" -N "" -f ~/.ssh/id_ed25519
71+
echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
72+
cat ~/.ssh/id_ed25519 >> $GITHUB_OUTPUT
73+
echo "EOF" >> $GITHUB_OUTPUT
74+
else
75+
echo "SSH_PRIVATE_KEY<<EOF" >> $GITHUB_OUTPUT
76+
echo "${{ secrets.PRIVATE_GITHUB_KEY }}" >> $GITHUB_OUTPUT
77+
echo "EOF" >> $GITHUB_OUTPUT
78+
fi
79+
80+
- name: Add private GitHub key to SSH agent
81+
uses: webfactory/[email protected]
82+
with:
83+
ssh-private-key: ${{ steps.generate_key.outputs.SSH_PRIVATE_KEY }}
3984

4085
- name: Build image
4186
run: |
42-
DEV_DOCKER_TAG_BASE=ghcr.io/${{ github.repository_owner }} COMPOSE_TAG=${GITHUB_REF##*/} make docker-compose-build
87+
DEV_DOCKER_TAG_BASE=ghcr.io/${OWNER_LC} \
88+
COMPOSE_TAG=${{ github.base_ref || github.ref_name }} \
89+
make docker-compose-build
4390
4491
- name: Generate API Schema
4592
run: |
93+
DEV_DOCKER_TAG_BASE=ghcr.io/${OWNER_LC} \
94+
COMPOSE_TAG=${{ github.base_ref || github.ref_name }} \
4695
docker run -u $(id -u) --rm -v ${{ github.workspace }}:/awx_devel/:Z \
47-
--workdir=/awx_devel ghcr.io/${{ github.repository_owner }}/awx_devel:${GITHUB_REF##*/} /start_tests.sh genschema
96+
--workdir=/awx_devel `make print-DEVEL_IMAGE_NAME` /start_tests.sh genschema
4897
4998
- name: Upload API Schema
5099
env:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ reports
122122
local/
123123
*.mo
124124
requirements/vendor
125+
requirements/requirements_git.credentials.txt
125126
.i18n_built
126127
.idea/*
127128
*credentials*.y*ml*

‎MANIFEST.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ include COPYING
2828
include Makefile
2929
prune awx/public
3030
prune awx/projects
31+
prune requirements/requirements_git.credentials.txt

0 commit comments

Comments
 (0)