Release/squid and CI fixes

.github/workflows/build_and_test.yaml

@@ -29,7 +29,7 @@ jobs:
       - name: Prepare Rock
         uses: canonical/craft-actions/rockcraft-pack@main
         id: rockcraft
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: rock
           path: ${{ steps.rockcraft.outputs.rock }} 
@@ -49,7 +49,7 @@ jobs:
 
 
   CephadmTest:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [build-rock, flake8-lint]
     strategy:
       matrix:
@@ -66,7 +66,7 @@ jobs:
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
 
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: rock
 
@@ -78,19 +78,6 @@ jobs:
       - name: install dependencies
         run: ./scripts/deploy-helper.sh install_custom_runner_dependencies
 
-      - name: Load image to registry
-        run: |
-          ls
-          rock_file=$(ls *.rock | head -1)
-          docker run -d -p 5000:5000 --restart=always --name registry registry:2
-          sleep 10
-          skopeo --insecure-policy copy oci-archive:$rock_file docker-daemon:canonical/ceph:latest
-          docker image ls -a
-          docker image tag canonical/ceph:latest localhost:5000/canonical/ceph:latest
-          sleep 10
-          docker push localhost:5000/canonical/ceph
-          echo $'[registries.insecure]\nregistries = ["localhost:5000"]' | sudo tee -a /etc/containers/registries.conf
-
       - name: install and init lxd snap
         run: |
           sudo snap install lxd
@@ -102,14 +89,28 @@ jobs:
           sudo systemctl reload snap.lxd.daemon
           sleep 5
 
-      - name: Deploy Cephadm over LXD Container
+      - name: Setup LXD machine
         run: |
-          reg_addr=$(./test/scripts/cephadm_helper.sh get_ip)
-          sudo python test/deploy.py --osd-num 3 --ceph-version reef image "$reg_addr:5000/canonical/ceph:latest"
+
+          ./test/scripts/cephadm_helper.sh setupLXDMachine
+          ./test/scripts/cephadm_helper.sh runOnHost cephadm0 install_apt 
+          ./test/scripts/cephadm_helper.sh runOnHost cephadm0 configure_insecure_registry
+
+          ./test/scripts/cephadm_helper.sh runOnHost cephadm0 deploy_cephadm localhost:5000/canonical/ceph:latest
+
+      - name: Add storage to machine
+        run: |
+          ./test/scripts/cephadm_helper.sh add_storage_devices
+
+      - name: Deploy osd service 
+        run: |
+          ./test/scripts/cephadm_helper.sh runOnHost cephadm0 deploy_osd 
+          ./test/scripts/cephadm_helper.sh runOnHost cephadm0 wait_num_objs osd 3 
 
   RookTest:
     needs: build-rock
-    runs-on: ubuntu-latest
+    # Minikube action only works on Jammy. 
+    runs-on: ubuntu-22.04
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -134,7 +135,7 @@ jobs:
           ./tests/scripts/github-action-helper.sh create_partitions_for_osds
 
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: rock
 
@@ -143,7 +144,7 @@ jobs:
           ls
           rock_file=$(ls *.rock | head -1)
           docker run -d -p 5000:5000 --restart=always --name registry registry:2
-          skopeo --insecure-policy copy oci-archive:$rock_file docker-daemon:canonical/ceph:latest
+          rockcraft.skopeo --insecure-policy copy oci-archive:$rock_file docker-daemon:canonical/ceph:latest
           docker image ls -a
           docker image tag canonical/ceph:latest localhost:5000/canonical/ceph:latest
           sleep 10

.github/workflows/collect-logs/action.yaml

@@ -17,7 +17,7 @@ runs:
         tests/scripts/collect-logs.sh
 
     - name: Upload canary test result
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.name }}
         path: /home/runner/work/test

rockcraft.yaml

@@ -1,19 +1,12 @@
 name: ceph
-base: ubuntu@22.04
+base: ubuntu@24.04
 version: '0.1' # replaced by CI when building to publish.
 summary: Ubuntu based Ceph container image
 description: Rock for Containerised Ceph based on Ubuntu Ceph distribution. 
 license: Apache-2.0
 platforms:
     amd64:
 
-# Custom PPAs for Bug: https://bugs.launchpad.net/ubuntu/jammy/+source/ceph/+bug/2003704
-# This will be removed once the required packages are available from jammy repositories.
-package-repositories:
-  - type: apt
-    cloud: bobcat
-    priority: always
-
 services:
     ceph-container:
         override: replace
@@ -63,7 +56,7 @@ parts:
             - attr # utilities for manipulating filesystem extended attributes
             - targetcli-fb
             - uuid-runtime
-            - python-setuptools
+            - python3-setuptools
             - udev
             - dmsetup
             - ceph-volume

scripts/deploy-helper.sh

@@ -20,8 +20,8 @@ set -xeEo pipefail
 
 function install_custom_runner_dependencies() {
   sudo apt-get -y update
-  sudo apt-get -y install skopeo
-  sudo python -m pip install --upgrade pip
+  # for recent skopeo client
+  sudo snap install rockcraft --classic
   sudo pip install flake8 pep8-naming pylxd pyyaml argparse
   sudo snap install docker
   sleep 10