Skip to content

Commit

Permalink
Merge pull request #283 from stackhpc/fixes
Browse files Browse the repository at this point in the history
Fix package promotion, update actions for node 20
  • Loading branch information
markgoddard authored Feb 2, 2024
2 parents 6d4f622 + e061754 commit 2cec221
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ inputs:
runs:
using: composite
steps:
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: 3.11.x
# Cache Python dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container-promote-old.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Release Train & dependencies
uses: ./.github/actions/setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container-promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
vault-password-file: ${{ env.ANSIBLE_VAULT_PASSWORD_FILE }}

- name: Clone StackHPC Kayobe configuration repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: stackhpc/stackhpc-kayobe-config
ref: refs/heads/${{ github.event.inputs.kayobe_config_branch }}
Expand Down
21 changes: 5 additions & 16 deletions .github/workflows/container-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,14 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Preparing Vault password file
run: |
echo "$ANSIBLE_VAULT_PASSWORD" > "$ANSIBLE_VAULT_PASSWORD_FILE"
env:
ANSIBLE_VAULT_PASSWORD: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}

- name: Installing dependencies
run: |
sudo apt update &&
sudo apt install -y python3-venv &&
python3 -m venv venv &&
source venv/bin/activate &&
pip install -U pip &&
pip install -r requirements.txt &&
ansible-galaxy collection install -r requirements.yml -p ansible/collections
- name: Setup Release Train & dependencies
uses: ./.github/actions/setup
with:
vault-password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
vault-password-file: ${{ env.ANSIBLE_VAULT_PASSWORD_FILE }}

- name: Publish container repositories
run: |
source venv/bin/activate &&
ansible-playbook -i ansible/inventory \
ansible/dev-pulp-container-publish.yml \
-e kolla_container_image_filter="'$FILTER'" \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/package-promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ jobs:
if [[ $CHECK_MODE = true ]]; then
args="$args --check --diff"
fi
source venv/bin/activate &&
ansible-playbook -i ansible/inventory \
ansible/dev-pulp-repo-version-query-kayobe.yml \
ansible/dev-pulp-repo-promote.yml \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package-update-kayobe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
# For now, just create an artifact that the user can download.
- name: Upload pulp-repo-versions.yml artifact
if: ${{ steps.git-diff.outputs.changed == 'true' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pulp-repo-versions.yml
path: stackhpc-kayobe-config/etc/kayobe/pulp-repo-versions.yml
Expand Down

0 comments on commit 2cec221

Please sign in to comment.