From 93661d51e8f18e0c59501292ed999edf80cb5552 Mon Sep 17 00:00:00 2001
From: Utkarsh Bhatt <utkarsh.bhatt@canonical.com>
Date: Wed, 5 Jun 2024 15:58:32 +0530
Subject: [PATCH] Commits to investigate CI

Signed-off-by: Utkarsh Bhatt <utkarsh.bhatt@canonical.com>
---
 .github/workflows/tests.yml | 28 ++++++++++++++++++++++++++++
 snap/snapcraft.yaml         |  4 ++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c04cb12b..5f85d3b0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -97,6 +97,8 @@ jobs:
         grep -q ceph-version $meta
 
         # Verify health and auto crush rule
+        sleep 60
+        sudo microceph.ceph status
         sudo microceph.ceph health | grep -q "OSD count 0 < osd_pool_default_size 3"
         sudo microceph.ceph osd crush rule ls | grep -F microceph_auto_osd
 
@@ -215,6 +217,11 @@ jobs:
         output=$(sudo microceph log get-level)
         if [[ "$output" != "3" ]] ; then echo "incorrect log level: $output"; exit 1; fi 
 
+    - name: Upload artifacts on failure
+      if: failure()
+      run: |
+        sudo snap logs microceph -n 1000
+
   multi-node-tests:
     name: Multi node testing
     runs-on: ubuntu-22.04
@@ -286,6 +293,17 @@ jobs:
       run: |
         set -uex
         lxc exec node-wrk0 -- sh -c "microceph.ceph osd crush rule ls" | grep -F microceph_auto_host
+        # Wait for storage to settle
+        for i in $(seq 1 10); do
+            res=$(lxc exec node-wrk0 -- sh -c "microceph.ceph osd pool ls detail" | grep -c "crush_rule 2" || true)
+            if [[ $res -eq 1 ]] ; then
+                echo "Crush rules reconfigured"
+                break
+            else
+                echo -n '.'
+                sleep 5
+            fi
+        done
         lxc exec node-wrk0 -- sh -c "microceph.ceph osd pool ls detail" | grep -F "crush_rule 2"
 
     - name: Add another OSD
@@ -334,6 +352,11 @@ jobs:
     - name: Test client configurations
       run: ~/actionutils.sh check_client_configs
 
+    - name: Upload artifacts on failure
+      if: failure()
+      run: |
+        sudo snap logs microceph -n 1000
+
   multi-node-tests-with-custom-microceph-ip:
     name: Multi node testing with custom microceph IP
     runs-on: ubuntu-22.04
@@ -434,6 +457,11 @@ jobs:
         ~/actionutils.sh wait_for_osds 3
         sudo microceph.ceph -s
 
+    - name: Upload artifacts on failure
+      if: failure()
+      run: |
+        sudo snap logs microceph -n 1000
+
   wal-db-tests:
     name: Test WAL/DB device usage
     runs-on: ubuntu-22.04
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 29a2b4ab..5e76b0ea 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -191,7 +191,7 @@ parts:
       - lib/*/libboost_filesystem.so*
       - lib/*/libboost_iostreams.so*
       - lib/*/libboost_program_options.so*
-      - lib/*/libboost_python312.so*
+      - lib/*/libboost_python310.so*
       - lib/*/libboost_thread.so*
       - lib/*/libcephfs.so*
       - lib/*/libcephsqlite.so*
@@ -211,7 +211,7 @@ parts:
       - lib/*/libpmem.so*
       - lib/*/libpmemobj.so*
       - lib/*/libpsl.so*
-      - lib/*/libpython3.12.so*
+      - lib/*/libpython3.10.so*
       - lib/*/librabbitmq.so*
       - lib/*/librados.so*
       - lib/*/libradosgw.so*