Test with KVM Lxd

Signed-off-by: Utkarsh Bhatt <[email protected]>
(cherry picked from commit c0f7b65)

.github/workflows/build_and_test.yaml

@@ -32,65 +32,23 @@ jobs:
           name: rock
           path: ${{ steps.rockcraft.outputs.rock }}
 
-  CephAdmScriptTest:
+  flake8-lint:
     runs-on: ubuntu-latest
-    needs: build-rock
-    strategy:
-      matrix:
-        python-version: ["3.10"]
-
+    name: Lint
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-      - name: clean unrequired files.
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-
-      - name: Download artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: rock
-
-      - name: set up python ${{ matrix.python-version }}
+      - name: Check out source repository
+        uses: actions/checkout@v3
+      - name: Set up Python environment
         uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: install dependencies
-        run: |
-          sudo apt install skopeo
-          sudo python -m pip install --upgrade pip
-          sudo pip install flake8 pep8-naming pylxd pyyaml argparse
-
-      - name: Lint Check
-        run: |
-          flake8 . --count --show-source --statistics
+          python-version: "3.10"
+      - name: flake8 Lint
+        uses: py-actions/flake8@v2
 
-      - name: use local block device
-        run: ./test/scripts/cephadm_helper.sh use_local_disk
 
-      - 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
-          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: Deploy Cephadm over Host
-        run: |
-          sudo python test/deploy.py --osd-num 1 --direct-host 1 image "localhost:5000/canonical/ceph:latest"
-
-  CephAdmScriptLxdTest:
+  CephadmTest:
     runs-on: ubuntu-latest
-    needs: build-rock
+    needs: [build-rock, flake8-lint]
     strategy:
       matrix:
         python-version: ["3.10"]
@@ -116,19 +74,14 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: install dependencies
-        run: |
-          sudo python -m pip install --upgrade pip
-          sudo pip install flake8 pep8-naming pylxd pyyaml argparse
-
-      - name: Lint Check
-        run: |
-          flake8 . --count --show-source --statistics
+        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
@@ -150,7 +103,7 @@ jobs:
       - name: Deploy Cephadm over LXD Container
         run: |
           reg_addr=$(./test/scripts/cephadm_helper.sh get_ip)
-          sudo python test/deploy.py --osd-num 0 --container 1 image "$reg_addr:5000/canonical/ceph:latest"
+          sudo python test/deploy.py --osd-num 3 --container 1 image "$reg_addr:5000/canonical/ceph:latest"
 
   RookTest:
     needs: build-rock

scripts/deploy-helper.sh

@@ -18,6 +18,15 @@
 
 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
+  sudo pip install flake8 pep8-naming pylxd pyyaml argparse
+  sudo snap install docker
+  sleep 10
+}
+
 
 function deploy_operator_with_custom_image() {
   local yaml=${1:?missing}

test/deploy.py

@@ -2,13 +2,13 @@
 import os
 import pwd
 import json
-import yaml
 import time
-import pylxd
 import string
 import random
 import argparse
 import subprocess
+import pylxd
+import yaml
 
 # Helper Translation Tables
 ceph_version_to_cloud_archive = {
@@ -39,7 +39,7 @@ class Cleaner:
     def __init__(self, model_file_path: string) -> None:
         if os.path.exists(model_file_path):
             # init client
-            self.client = pylxd.Client()
+            self.client = pylxd.Client(project='default')
             self.clean(model_file_path)
         else:
             print(f"Model File {model_file_path} does not exists.")
@@ -91,6 +91,7 @@ def clean(self, model_file_path: string) -> None:
 
 
 class DeployRunner:
+    """Deploys LXD based Cephadm"""
     # LXD Vars
     model_id = _get_random_string(4)
     deploy_tag = "ubuntu-ceph-" + model_id
@@ -226,7 +227,7 @@ def create_instance_profile(
 
     def create_instance(
         self,
-        image="ubuntu/jammy",
+        image_name="jammy",
         flavor="c4-m10",
         pool_name=deploy_tag,
         profile_name=deploy_tag,
@@ -254,8 +255,8 @@ def create_instance(
             "source": {
                 "type": "image",
                 "certificate": "",
-                "alias": image,
-                "server": "https://images.linuxcontainers.org",
+                "alias": image_name,
+                "server": "https://cloud-images.ubuntu.com/releases",
                 "protocol": "simplestreams",
                 "mode": "pull",
                 "allow_inconsistent": False,
@@ -362,6 +363,7 @@ def check_output_on_target_cephadm_shell(
             )
 
     def wait_for_instance_ready(self, instance_name, max_attempt=20) -> None:
+        """Wait for the LXD instance to be ready."""
         is_container_ready = False
         counter = 0
         while not is_container_ready: