From 63fd329e5f9646e51fd9b297073eaf597b399b50 Mon Sep 17 00:00:00 2001
From: Paul Browne <pfb29@cam.ac.uk>
Date: Tue, 8 Oct 2024 11:57:35 +0100
Subject: [PATCH] Fix local CI in forked azimuth-images repo

---
 .github/workflows/pr.yaml                   |  4 ++--
 ansible/roles/linux-broadcom/tasks/main.yml | 17 +++++++++++++++++
 ansible/roles/linux-common/tasks/main.yml   |  4 ++++
 bin/publish-image                           |  2 +-
 vars/arcus/common.json                      |  4 ++--
 vars/arcus/linux.json                       |  2 +-
 6 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 ansible/roles/linux-broadcom/tasks/main.yml

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 1ce234e9..c40f681d 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -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:
diff --git a/ansible/roles/linux-broadcom/tasks/main.yml b/ansible/roles/linux-broadcom/tasks/main.yml
new file mode 100644
index 00000000..5e06dbec
--- /dev/null
+++ b/ansible/roles/linux-broadcom/tasks/main.yml
@@ -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
diff --git a/ansible/roles/linux-common/tasks/main.yml b/ansible/roles/linux-common/tasks/main.yml
index 6190450d..10a1aa19 100644
--- a/ansible/roles/linux-common/tasks/main.yml
+++ b/ansible/roles/linux-common/tasks/main.yml
@@ -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
diff --git a/bin/publish-image b/bin/publish-image
index 1e0f3540..8cc51ab7 100755
--- a/bin/publish-image
+++ b/bin/publish-image
@@ -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
diff --git a/vars/arcus/common.json b/vars/arcus/common.json
index fdfad6e7..e847f92a 100644
--- a/vars/arcus/common.json
+++ b/vars/arcus/common.json
@@ -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"
 }
diff --git a/vars/arcus/linux.json b/vars/arcus/linux.json
index af641b56..2a0db531 100644
--- a/vars/arcus/linux.json
+++ b/vars/arcus/linux.json
@@ -1,3 +1,3 @@
 {
-  "security_groups": ["default", "ssh-anywhere"]
+  "security_groups": ["default", "external"]
 }