Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix local CI in forked azimuth-images repo #3

Merged
merged 1 commit into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
fail_on_remote:
runs-on: ubuntu-latest
steps:
- name: PR must be from a branch in the azimuth-cloud/azimuth-images repo
run: exit ${{ github.repository == 'azimuth-cloud/azimuth-images' && '0' || '1' }}
- name: PR must be from a branch in the RSE-Cambridge/azimuth-images repo
run: exit ${{ github.repository == 'RSE-Cambridge/azimuth-images' && '0' || '1' }}

# Build, publish and test the images
build_test_images:
Expand Down
17 changes: 17 additions & 0 deletions ansible/roles/linux-broadcom/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
- name: Install pre-requisites
ansible.builtin.apt:
pkg:
- dctrl-tools
- gcc-12
- cpp-12
- libgcc-12-dev
- libasan8
- libtsan2
- dkms
state: latest

- name: Install the broadcom driver for NetXtreme-E Ethernet
ansible.builtin.apt:
deb: https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_7ac3c0a502cd46c783b2128116165566/bcom-nxe-drivers/netxtreme-peer-mem-dkms_229.2.49.0_all.deb
state: present
4 changes: 4 additions & 0 deletions ansible/roles/linux-common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,7 @@
# Enables volumes to be referred to by tag for setting up mounts in cloud-config
- include_role:
name: linux-volumes-by-tag

# Install the Broadcom network driver for NetXtreme-E Ethernet
- include_role:
name: linux-broadcom
2 changes: 1 addition & 1 deletion bin/publish-image
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cosign sign-blob "${IMAGE_NAME}.qcow2" --bundle "${IMAGE_NAME}.cosign.bundle" -y
# test the bundle works validates
cosign verify-blob "${IMAGE_NAME}.qcow2" --bundle "${IMAGE_NAME}.cosign.bundle" \
--certificate-oidc-issuer="https://token.actions.githubusercontent.com" \
--certificate-identity-regexp="https://github.com/azimuth-cloud/azimuth-images/.github/.*"
--certificate-identity-regexp="https://github.com/RSE-Cambridge/azimuth-images/.github/.*"

# Upload the compressed image to S3
cat <<EOF > ~/.s3cfg
Expand Down
4 changes: 2 additions & 2 deletions vars/arcus/common.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"network": "97ed78b5-156c-441c-9fcb-5a26c8a4ed26",
"flavor": "vm.azimuth.ci.ec1.medium",
"network": "5e8d514a-1943-42e4-a757-6c533c343ece",
"flavor": "vm.v1.small",
"volume_type": "arcus-ceph01-rbd"
}
2 changes: 1 addition & 1 deletion vars/arcus/linux.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"security_groups": ["default", "ssh-anywhere"]
"security_groups": ["default", "external"]
}
Loading