Skip to content

Commit d302aaa

Browse files
authored
Merge pull request #22 from stackhpc/2025.3.1-sync
2025.3.1 sync
2 parents 73fe5c7 + 336987b commit d302aaa

26 files changed

+3142
-35
lines changed
726 Bytes
Binary file not shown.

.github-deploy-prod.yml.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
sudo apt install -y python3-venv python3-dev build-essential unzip git-crypt
3737

3838
- name: Checkout the config repo
39-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
4040

4141
- name: Deploy Azimuth
4242
shell: bash

.github-deploy-staging.yml.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
sudo apt install -y python3-venv python3-dev build-essential unzip git-crypt
2727

2828
- name: Checkout the config repo
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030

3131
- name: Deploy Azimuth
3232
shell: bash

.github-upgrade-check.yml.sample

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33
# newer tag is found in the upstream repository then a pull request is created to the downstream repo
44
# in order to merge in the changes from the new upstream release.
55

6-
# To use this workflow in a downstream azimuth-config repository simply copy it into .github/workflows
7-
# and give it an appropriate name, e.g.
8-
# cp .github-upgrade-check.yml.sample .github/workflows/upgrade-check.yml
6+
# To use this workflow in a downstream azimuth-config repository, first copy it into .github/workflows
7+
# and give it an appropriate name, e.g. `cp .github-upgrade-check.yml.sample .github/workflows/upgrade-check.yml`
8+
# then create a fine-grained GitHub access token for the target repository with the permissions specified here:
9+
# https://github.com/peter-evans/create-pull-request?tab=readme-ov-file#token
10+
# (i.e. contents: write, pull-requests: write AND workflows: write).
11+
# GitHub actions can be funny about using tokens with no expiry date in workflows so make sure the token
12+
# has an expiry date. After creating the token, copy the generated secret string and set it as a GitHub
13+
# actions secret named WORKFLOW_TOKEN in the repository's settings page.
914

1015
name: Check for upstream updates
1116
on:
@@ -58,11 +63,12 @@ jobs:
5863

5964
- name: Create Pull Request
6065
if: ${{ steps.release_tag.outputs.value }}
61-
uses: peter-evans/create-pull-request@v6
66+
uses: peter-evans/create-pull-request@v7
6267
with:
6368
base: main
6469
branch: ${{ steps.branch_name.outputs.value }}
6570
title: "Upgrade Azimuth to ${{ steps.release_tag.outputs.value }}"
6671
body: This PR was automatically generated by GitHub Actions.
6772
commit-message: "Upgrade Azimuth to ${{ steps.release_tag.outputs.value }}"
6873
delete-branch: true
74+
token: ${{ secrets.WORKFLOW_TOKEN }}

.github/actions/setup/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ runs:
4444
using: composite
4545
steps:
4646
- name: Checkout azimuth-config repo
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848
with:
4949
repository: ${{ inputs.repository }}
5050
ref: ${{ inputs.ref }}
@@ -89,10 +89,10 @@ runs:
8989
this_variable_is_never_used: ever
9090
${{ inputs.extra-vars }}
9191
92-
- name: Ensure Python 3.9
93-
uses: actions/setup-python@v4
92+
- name: Ensure Python 3.10
93+
uses: actions/setup-python@v5
9494
with:
95-
python-version: "3.9"
95+
python-version: "3.10"
9696
check-latest: true
9797

9898
- name: Set up Python virtual environment

.github/actions/test/action.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,28 @@ runs:
3030
source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
3131
ansible-playbook azimuth_cloud.azimuth_ops.generate_tests -e @extra-vars.yml
3232
33+
- name: Downgrade installed firefox browser version
34+
shell: bash
35+
# Based on https://support.mozilla.org/en-US/kb/install-firefox-linux
36+
run: |
37+
set -e
38+
# Import Mozilla repo key
39+
sudo install -d -m 0755 /etc/apt/keyrings
40+
wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | sudo tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null
41+
# Check fingerprint
42+
if [[ $(gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | grep 35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3) ]]; then
43+
echo "Fingerprint matches"
44+
else
45+
echo "Mozilla repo fingerprint doesn't match expected"
46+
exit 1
47+
fi
48+
# Add repo to sources
49+
echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | sudo tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null
50+
# Install Firefox extended support release
51+
sudo apt update
52+
sudo apt remove firefox # Uninstall default version (1.136.0)
53+
sudo apt install -y firefox-esr # Install older version (1.128)
54+
3355
- name: Run test suite
3456
shell: bash
3557
run: |
@@ -39,7 +61,7 @@ runs:
3961
./bin/run-tests
4062
4163
- name: Upload test report artifacts
42-
uses: actions/upload-artifact@v3
64+
uses: actions/upload-artifact@v4
4365
with:
4466
name: ${{ inputs.test-report-artifact-name }}
4567
path: |
@@ -67,7 +89,7 @@ runs:
6789
if: ${{ always() }}
6890

6991
- name: Upload debug bundle
70-
uses: actions/upload-artifact@v3
92+
uses: actions/upload-artifact@v4
7193
with:
7294
name: ${{ inputs.debug-bundle-artifact-name }}
7395
path: debug-bundle.tar.gz

.github/workflows/publish-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out the repository
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Generate and update release notes
1717
uses: ./.github/actions/release-notes

.github/workflows/test-backup-restore.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
# We need to check out the code under test first in order to use local actions
2828
- name: Checkout code under test
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030

3131
- name: Set up Azimuth environment
3232
uses: ./.github/actions/setup
@@ -103,7 +103,7 @@ jobs:
103103
if: ${{ !cancelled() }}
104104

105105
- name: Upload pre-restore debug bundle
106-
uses: actions/upload-artifact@v3
106+
uses: actions/upload-artifact@v4
107107
with:
108108
name: azimuth-pre-restore-debug-bundle
109109
path: debug-bundle.tar.gz
@@ -157,7 +157,7 @@ jobs:
157157
if: ${{ always() }}
158158

159159
- name: Upload test report artifacts
160-
uses: actions/upload-artifact@v3
160+
uses: actions/upload-artifact@v4
161161
with:
162162
name: azimuth-restore-test-reports
163163
path: reports/*
@@ -172,7 +172,7 @@ jobs:
172172
if: ${{ always() }}
173173

174174
- name: Upload debug bundle
175-
uses: actions/upload-artifact@v3
175+
uses: actions/upload-artifact@v4
176176
with:
177177
name: azimuth-restore-debug-bundle
178178
path: debug-bundle.tar.gz

.github/workflows/test-ha.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
# We need to check out the code under test first in order to use local actions
2323
- name: Checkout code under test
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525

2626
- name: Set up Azimuth environment
2727
uses: ./.github/actions/setup

.github/workflows/test-singlenode.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
steps:
6464
# We need to check out the code under test first in order to use local actions
6565
- name: Checkout code under test
66-
uses: actions/checkout@v3
66+
uses: actions/checkout@v4
6767

6868
- name: Set up Azimuth environment
6969
uses: ./.github/actions/setup

0 commit comments

Comments
 (0)