Merge pull request #3512 from mulkieran/version-3.6.3

Version 3.6.3
stratis-storage · Nov 30, 2023 · ae54933 · ae54933
2 parents 67d1427 + 4d47bf5
commit ae54933
Show file tree

Hide file tree

Showing 18 changed files with 182 additions and 78 deletions.
diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
@@ -29,7 +29,7 @@ jobs:
   checks-with-ci-repo:
     runs-on: ubuntu-22.04
     container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies for Fedora
@@ -51,7 +51,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Check out ci repo
         run: git clone https://github.com/stratis-storage/ci.git
       - name: Run comparisons of version specs with available Fedora packages

diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
@@ -13,7 +13,7 @@ on:
       - 'tests/**'
       - '.packit.yaml'
       - 'plans/**'
-      - 'test/**'
+      - 'tests-fmf/**'
   pull_request:
     branches:
       - patch-3.6.0
@@ -24,7 +24,7 @@ on:
       - 'tests/**'
       - '.packit.yaml'
       - 'plans/**'
-      - 'test/**'
+      - 'tests-fmf/**'
 
   workflow_dispatch:
 
@@ -40,43 +40,43 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile clippy
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: clippy
           - task: PROFILEDIR=debug make -f Makefile build
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-no-ipc
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile docs-ci
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile test
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: >-
               TANG_URL=localhost
               make -f Makefile test-clevis-loop-should-fail
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-min
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-no-ipc
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev
     steps:
       - uses: actions/checkout@v3
@@ -107,11 +107,11 @@ jobs:
       matrix:
         include:
           - task: RUST_LOG=stratisd=debug make -f Makefile test-loop
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev --ipc=host
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ on:
       - 'tests/**'
       - '.packit.yaml'
       - 'plans/**'
-      - 'test/**'
+      - 'tests-fmf/**'
   pull_request:
     branches:
       - patch-3.6.0
@@ -24,7 +24,7 @@ on:
       - 'tests/**'
       - '.packit.yaml'
       - 'plans/**'
-      - 'test/**'
+      - 'tests-fmf/**'
 
   workflow_dispatch:
 
@@ -40,14 +40,14 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile fmt-ci
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: rustfmt
           - task: make -f Makefile check-typos
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged -v /dev:/dev
     steps:
       - uses: actions/checkout@v3
@@ -83,17 +83,17 @@ jobs:
               TANG_URL=tang
               RUST_LOG=stratisd=debug
               make -f Makefile test-clevis-loop
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
-            image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
+            image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
     runs-on: ubuntu-22.04
     container:
       image: ${{ matrix.image }}
       options: --privileged -v /dev:/dev -v /run/udev:/run/udev --ipc=host
     services:
       tang:
         # yamllint disable rule:line-length
-        image: ghcr.io/stratis-storage/stratisd/tang:38  # CURRENT DEVELOPMENT ENVIRONMENT
+        image: ghcr.io/stratis-storage/stratisd/tang:38
         credentials:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
@@ -184,7 +184,7 @@ jobs:
   stratis-min-cli-checks:
     runs-on: ubuntu-22.04
     container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged --userns=host --ipc=host -v /dev:/dev -v /run/udev:/run/udev -v /usr/lib/udev:/usr/lib/udev -v /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro -v /usr/share/dbus-1:/usr/share/dbus-1
     steps:
       - uses: actions/checkout@v3
@@ -217,7 +217,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Run stratisd-min cli tests
         run: make test-stratisd-min
       - name: Run stratis-min cli tests
@@ -226,7 +226,7 @@ jobs:
   shell-checks:
     runs-on: ubuntu-22.04
     container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies
@@ -241,7 +241,7 @@ jobs:
   python-based-tests:
     runs-on: ubuntu-22.04
     container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
+      image: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
       options: --privileged -v /dev:/dev
     steps:
       - uses: actions/checkout@v3
@@ -267,7 +267,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Build stratisd
         run: PROFILEDIR=debug make -f Makefile build-all
       - name: Install stratisd

diff --git a/.github/workflows/support.yml b/.github/workflows/support.yml
@@ -8,13 +8,19 @@ on:
     branches:
       - patch-3.6.0
     paths:
+      - ".packit.yaml"
+      - "plans/**"
+      - "tests-fmf/**"
       - "**/*.yml"
       - "tests/**"
       - "!tests/**/README.*"
   pull_request:
     branches:
       - patch-3.6.0
     paths:
+      - ".packit.yaml"
+      - "plans/**"
+      - "tests-fmf/**"
       - "**/*.yml"
       - "tests/**"
       - "!tests/**/README.*"
@@ -49,7 +55,7 @@ jobs:
             task: make -f Makefile yamllint tmtlint
             working-directory: .
     runs-on: ubuntu-22.04
-    container: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
+    container: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -13,7 +13,7 @@ on:
       - 'tests/**'
       - '.packit.yaml'
       - 'plans/**'
-      - 'test/**'
+      - 'tests-fmf/**'
   pull_request:
     branches:
       - patch-3.6.0
@@ -24,7 +24,7 @@ on:
       - 'tests/**'
       - '.packit.yaml'
       - 'plans/**'
-      - 'test/**'
+      - 'tests-fmf/**'
 
   workflow_dispatch:
 
@@ -40,34 +40,34 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile clippy
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: clippy
           - task: PROFILEDIR=debug make -f Makefile build
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-no-ipc
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile docs-ci
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile test
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-min
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-no-ipc
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
@@ -105,7 +105,7 @@ jobs:
       matrix:
         include:
           - task: RUST_LOG=stratisd=debug make -f Makefile test-loop
-            toolchain: 1.73.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.74.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:

diff --git a/.packit.yaml b/.packit.yaml
@@ -30,28 +30,28 @@ jobs:
     - job: copr_build
       trigger: pull_request
       targets:
-          - fedora-rawhide
+          - fedora-all
 
     - job: tests
       identifier: local
       trigger: pull_request
       targets:
-          - fedora-rawhide
+          - fedora-all
 
     # run Cockpit storage tests, see plans/ with `cockpit == yes`
     - job: tests
       identifier: cockpit
       trigger: pull_request
-      notifications:
-        failure_comment:
-          message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check."
       targets:
-      - fedora-development
+          - fedora-development
+      notifications:
+          failure_comment:
+              message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check."
       tf_extra_params:
-        environments:
-          - artifacts:
-            - type: repository-file
-              id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo
-            tmt:
-              context:
-                plan: "cockpit"
+          environments:
+              - artifacts:
+                    - type: repository-file
+                      id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo
+                tmt:
+                    context:
+                        plan: "cockpit"
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,26 @@
+stratisd 3.6.3
+==============
+Recommended Rust toolchain version: 1.74.0
+Recommended development platform for Python development: Fedora 39
+
+- Cherry-picked commits:
+  * Fix clippy 1.74 errors
+  * packit.yaml: fix indentation
+  * support.yml: trigger on packit and tmt changes
+  * Fix up excludes for tests-fmf
+  * Re-indent .packit.yaml
+  * github actions: update recommended Rust to 1.74.0
+  * Tidy up targets key
+  * Use fedora-all for our tests
+  * Advance current development environment to Fedora 39
+  * Leave tang container as F38
+  * Apply formatting changes from black 23.7.0
+  * Remove obsolete parameter
+  * Unconditionally add nrext64=0 to inode options
+  * Check the mkfs.xfs version
+  * Use semver crate to compare versions
+
+
 stratisd 3.6.2
 ==============
 Recommended Rust toolchain version: 1.73.0

diff --git a/Cargo.lock b/Cargo.lock