Merge pull request #59 from canonical/cleanup/oldScripts

Fix CI and Housekeeping

.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 --ceph-version reef 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  --ceph-version reef image "$reg_addr:5000/canonical/ceph:latest"
+          sudo python test/deploy.py --osd-num 3 --ceph-version reef image "$reg_addr:5000/canonical/ceph:latest"
 
   RookTest:
     needs: build-rock