Merge pull request #2630 from mulkieran/develop-2.4.1-2.4.2

Develop 2.4.1 2.4.2
stratis-storage · Jun 2, 2021 · 8fc1459 · 8fc1459
2 parents f73b126 + b7bef3d
commit 8fc1459
Show file tree

Hide file tree

Showing 32 changed files with 710 additions and 883 deletions.
diff --git a/.clippy.toml b/.clippy.toml
@@ -0,0 +1 @@
+msrv = "1.49.0"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,14 +6,14 @@ on:
   push:
     branches:
       - master
-      - develop-2.4.0
+      - develop-2.4.1
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'
   pull_request:
     branches:
       - master
-      - develop-2.4.0
+      - develop-2.4.1
     paths-ignore:
       - 'CHANGES.txt'
       - '**/README.md'
@@ -28,21 +28,21 @@ jobs:
         include:
           # MANDATORY CHECKS USING CURRENT DEVELOPMENT COMPILER
           - task: make -f Makefile fmt-travis
-            toolchain: 1.51.0
+            toolchain: 1.52.1
             components: rustfmt
             image: ubuntu:groovy
           - task: make -f Makefile clippy
-            toolchain: 1.51.0
+            toolchain: 1.52.1
             components: clippy
             image: ubuntu:groovy
           - task: make -f Makefile fmt-travis
-            toolchain: 1.51.0
+            toolchain: 1.52.1
             components: rustfmt
-            image: fedora:32
+            image: fedora:33
           - task: make -f Makefile clippy
-            toolchain: 1.51.0
+            toolchain: 1.52.1
             components: clippy
-            image: fedora:32
+            image: fedora:33
           # MANDATORY TESTING ON STABLE
           - task: make -f Makefile build
             toolchain: stable
@@ -75,31 +75,31 @@ jobs:
           - task: make -f Makefile build
             toolchain: stable
             components: cargo
-            image: fedora:32
+            image: fedora:33
           - task: make -f Makefile build-min
             toolchain: stable
             components: cargo
-            image: fedora:32
+            image: fedora:33
           - task: make -f Makefile build-extras
             toolchain: stable
             components: cargo
-            image: fedora:32
+            image: fedora:33
           - task: make -f Makefile docs-travis
             toolchain: stable
             components: cargo
-            image: fedora:32
+            image: fedora:33
           - task: make -f Makefile test
             toolchain: stable
             components: cargo
-            image: fedora:32
+            image: fedora:33
           - task: make -f Makefile release
             toolchain: stable
             components: cargo
-            image: fedora:32
+            image: fedora:33
           - task: make -f Makefile release-min
             toolchain: stable
             components: cargo
-            image: fedora:32
+            image: fedora:33
     runs-on: ubuntu-18.04
     container:
       image: ${{ matrix.image }}
@@ -132,7 +132,7 @@ jobs:
           libblkid-devel
           make
           systemd-devel
-        if: matrix.image == 'fedora:32'
+        if: matrix.image == 'fedora:33'
       - uses: actions-rs/toolchain@v1
         with:
           components: ${{ matrix.components }}
@@ -154,7 +154,7 @@ jobs:
           - task: RUST_LOG=libstratis=debug make -f Makefile test-loop
             toolchain: stable
             components: cargo
-            image: fedora:32
+            image: fedora:33
     runs-on: ubuntu-18.04
     container:
       image: ${{ matrix.image }}
@@ -196,7 +196,7 @@ jobs:
           systemd-devel
           systemd-udev
           xfsprogs
-        if: matrix.image == 'fedora:32'
+        if: matrix.image == 'fedora:33'
       - uses: actions-rs/toolchain@v1
         with:
           components: ${{ matrix.components }}
@@ -221,7 +221,7 @@ jobs:
               make -f Makefile test-clevis-loop
             toolchain: stable
             components: cargo
-            image: fedora:32
+            image: fedora:33
     runs-on: ubuntu-18.04
     container:
       image: ${{ matrix.image }}
@@ -274,31 +274,18 @@ jobs:
               python3-requests
               python3-semantic_version
               python3-pygithub
-            image: fedora:32
+            image: fedora:33
             task: >
               (cd code_maintenance; make -f Makefile lint) &&
-              (cd developer_tools; make -f Makefile lint) &&
               (cd tests/client-dbus; PYTHONPATH=./src make -f Makefile lint)
           - dependencies: black python3-isort
-            image: fedora:32
+            image: fedora:33
             task: >
               (cd code_maintenance; make -f Makefile fmt-travis) &&
-              (cd developer_tools; make -f Makefile fmt-travis) &&
               (cd tests/client-dbus; make -f Makefile fmt-travis)
           - dependencies: yamllint
-            image: fedora:32
+            image: fedora:33
             task: make -f Makefile yamllint
-          # MANDATORY PYTHON CHECKS ON LOWEST SUPPORTED INTERPRETER
-          - dependencies: >
-              pylint
-              python3-dbus-client-gen
-              python3-dbus-python-client-gen
-              python3-psutil
-              python3-pyudev
-            image: fedora:29
-            task: >
-              (cd developer_tools; make -f Makefile lint) &&
-              (cd tests/client-dbus; PYTHONPATH=./src make -f Makefile lint)
     runs-on: ubuntu-18.04
     container: ${{ matrix.image }}
     steps:
@@ -313,3 +300,121 @@ jobs:
         run: python --version
       - name: Run test
         run: ${{ matrix.task }}
+
+  stratis-cli-checks:
+    runs-on: ubuntu-18.04
+    container: fedora:30  # LOWEST SUPPORTED ENVIRONMENT PROXY
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: >
+          dnf install -y
+          asciidoc
+          clang
+          cryptsetup-devel
+          dbus-daemon
+          dbus-tools
+          dbus-devel
+          libblkid-devel
+          git
+          make
+          python3-coverage
+          python3-dbus-client-gen
+          python3-dbus-python-client-gen
+          python3-justbytes
+          python3-dateutil
+          python3-psutil
+          python3-semantic_version
+          systemd-devel
+      - uses: actions-rs/toolchain@v1
+        with:
+          components: cargo
+          toolchain: 1.49.0  # LOWEST SUPPORTED RUST TOOLCHAIN
+          override: true
+      - name: Build stratisd
+        run: PROFILEDIR=debug make -f Makefile install
+      - name: Check out stratis-cli
+        run: git clone https://github.com/stratis-storage/stratis-cli.git
+      - name: Set up for D-Bus
+        run: |
+          mkdir -p /var/lib/dbus
+          dbus-uuidgen > /var/lib/dbus/machine-id
+          mkdir -p /var/run/dbus
+      - name: Start D-Bus
+        run: >
+          dbus-daemon
+          --config-file=/usr/share/dbus-1/system.conf
+          --print-address
+      - name: Run stratis-cli tests
+        run: >
+          RUST_LOG=libstratis=debug,stratisd=debug
+          STRATISD=/usr/libexec/stratisd
+          PYTHONPATH=./src
+          make dbus-tests
+        working-directory: ./stratis-cli
+
+  # PYTHON-BASED TESTS WITH UDEV
+  python-based-tests:
+    strategy:
+      matrix:
+        include:
+          # MANDATORY CHECKS USING CURRENT DEVELOPMENT ENVIRONMENT
+          - image: fedora:33
+            toolchain: 1.52.1  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          # MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
+          - image: fedora:30
+            toolchain: 1.49.0  # LOWEST SUPPORTED RUST TOOLCHAIN
+    runs-on: ubuntu-18.04
+    container:
+      image: ${{ matrix.image }}
+      options: --privileged -v /dev:/dev
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies for Fedora
+        run: >
+          dnf install -y
+          asciidoc
+          clang
+          cryptsetup-devel
+          curl
+          dbus-daemon
+          dbus-devel
+          dbus-tools
+          device-mapper-persistent-data
+          libblkid-devel
+          make
+          python3-dbus
+          python3-dbus-client-gen
+          python3-dbus-python-client-gen
+          python3-psutil
+          python3-pyudev
+          systemd-devel
+          systemd-udev
+          xfsprogs
+      - uses: actions-rs/toolchain@v1
+        with:
+          components: cargo
+          toolchain: ${{ matrix.toolchain }}
+          override: true
+      - name: Install all necessary Stratis files
+        run: PROFILEDIR=debug make -f Makefile install
+      - name: Start udev
+        run: /usr/lib/systemd/systemd-udevd &
+      - name: Set up for D-Bus
+        run: |
+          mkdir -p /var/lib/dbus
+          dbus-uuidgen > /var/lib/dbus/machine-id
+          mkdir -p /var/run/dbus
+      - name: Start D-Bus
+        run: >
+          dbus-daemon
+          --config-file=/usr/share/dbus-1/system.conf
+          --print-address
+      - name: Tests on ${{ matrix.image }} using Rust ${{ matrix.toolchain }}
+        run: >
+          RUST_LOG=libstratis=debug,stratisd=debug
+          STRATISD=/usr/libexec/stratisd
+          STRATIS_PREDICT_USAGE=/usr/bin/stratis-predict-usage
+          PYTHONPATH=./src
+          make udev-tests
+        working-directory: ./tests/client-dbus