changed cephadm script dependencies

canonical · Feb 4, 2025 · 785434c · 785434c
1 parent 0aac1b2
commit 785434c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -49,7 +49,7 @@ jobs:
 
 
   CephadmTest:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [build-rock, flake8-lint]
     strategy:
       matrix:
@@ -143,7 +143,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

diff --git a/scripts/deploy-helper.sh b/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