Merge #1694

1694: ci: ensure fmt fails on jenkins r=tiagolobocastro a=tiagolobocastro



Co-authored-by: Tiago Castro <tiagolobocastro@gmail.com>

Author: mayastor-bors

Cargo.lock

@@ -138,9 +138,10 @@ pipeline {
       steps {
         cleanWs()
         unstash 'source'
-        sh 'nix-shell --run "./scripts/rust-style.sh" ci.nix'
+        sh 'nix-shell --run "FMT_OPTS=--check ./scripts/rust-style.sh" ci.nix'
         sh 'nix-shell --run "./scripts/rust-linter.sh" ci.nix'
         sh 'nix-shell --run "./scripts/js-check.sh" ci.nix'
+        sh 'nix-shell --run "nixpkgs-fmt --check ." ci.nix'
         script {
           if (env.BRANCH_NAME != "trying") {
             sh 'nix-shell --run "./scripts/check-submodule-branches.sh" ci.nix'

Jenkinsfile

@@ -37,7 +37,10 @@ let
         numactl
         pytest_inputs
         udev
+        libnvme
+        nvme-cli
         xfsprogs
+        nixpkgs-fmt
       ];
 
       shellEnv = with pkgs; {
@@ -67,6 +70,6 @@ let
     };
   };
 in
-  pkgs.mkShell shellAttrs // {
-    name = "io-engine-dev-shell";
-  }
+pkgs.mkShell shellAttrs // {
+  name = "io-engine-dev-shell";
+}

ci.nix

@@ -2,8 +2,8 @@
 , spdk ? "develop"
 , spdk-path ? null
 } @ args:
-  import ./ci.nix {
-    inherit rust;
-    inherit spdk;
-    inherit spdk-path;
-  }
+import ./ci.nix {
+  inherit rust;
+  inherit spdk;
+  inherit spdk-path;
+}

ide.nix

@@ -22,9 +22,9 @@ use spdk_rs::libspdk::{
     spdk_nvme_qpair_set_abort_dnr,
 };
 
+use std::mem::zeroed;
 #[cfg(feature = "spdk-async-qpair-connect")]
 use std::{os::raw::c_void, time::Duration};
-use std::mem::zeroed;
 
 #[cfg(feature = "spdk-async-qpair-connect")]
 use spdk_rs::{

io-engine/src/bdev/nvmx/qpair.rs

@@ -27,6 +27,7 @@ use spdk_rs::{
     libspdk::{
         spdk_app_shutdown_cb,
         spdk_env_dpdk_post_init,
+        spdk_env_dpdk_rte_eal_init,
         spdk_env_fini,
         spdk_log_close,
         spdk_log_level,
@@ -43,7 +44,6 @@ use spdk_rs::{
         spdk_thread_lib_fini,
         spdk_thread_send_critical_msg,
         spdk_trace_cleanup,
-        spdk_env_dpdk_rte_eal_init,
         SPDK_LOG_DEBUG,
         SPDK_LOG_INFO,
         SPDK_RPC_RUNTIME,

io-engine/src/core/env.rs

@@ -14,4 +14,4 @@ self: super: rec {
   nvmet-cli = super.callPackage ./pkgs/nvmet-cli { };
   units = (super.callPackage ./pkgs/io-engine/units.nix { inherit tag sourcer; });
 }
-// (import ../spdk-rs/nix/overlay.nix { } self super)
+  // (import ../spdk-rs/nix/overlay.nix { } self super)

nix/overlay.nix

@@ -27,6 +27,7 @@
 , targetPlatform
 , versions
 , systemdMinimal
+, rdma-core
 , cargoBuildFlags ? [ ]
 }:
 let
@@ -87,6 +88,7 @@ let
       protobuf
       systemdMinimal.dev
       utillinux.dev
+      rdma-core
     ];
     cargoLock = {
       lockFile = ../../../Cargo.lock;

nix/pkgs/io-engine/cargo-package.nix

@@ -1,27 +1,5 @@
 { stdenv
-, clang
-, dockerTools
-, e2fsprogs
 , lib
-, libaio
-, libbsd
-, libspdk
-, libspdk-dev
-, libpcap
-, udev
-, liburing
-, makeRustPlatform
-, numactl
-, openssl
-, pkg-config
-, protobuf
-, sources
-, xfsprogs
-, utillinux
-, llvmPackages
-, targetPackages
-, buildPackages
-, targetPlatform
 , pkgs
 , git
 , tag

nix/pkgs/io-engine/default.nix

@@ -1,3 +1,2 @@
-
 # Redirects to `spdk-rs`.
 import ../spdk-rs/nix/sources.nix

nix/sources.nix

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ${BASH_SOURCE%/*}/rust-linter-env.sh
+source ${BASH_SOURCE%/*}/../spdk-rs/scripts/rust-linter-env.sh
 $CARGO clippy --all --all-targets --features=io-engine-testing -- -D warnings \
     -A clippy::await-holding-lock \
     -A clippy::await-holding-refcell-ref \

scripts/rust-linter-env.sh

@@ -2,5 +2,5 @@
 
 FMT_OPTS=${FMT_OPTS:-""}
 
-source ${BASH_SOURCE%/*}/rust-linter-env.sh
+source ${BASH_SOURCE%/*}/../spdk-rs/scripts/rust-linter-env.sh
 $CARGO fmt --all -- $FMT_OPTS

scripts/rust-linter.sh

@@ -2,8 +2,8 @@
 , spdk ? "develop"
 , spdk-path ? null
 } @ args:
-  import ./ci.nix {
-    inherit rust;
-    inherit spdk;
-    inherit spdk-path;
-  }
+import ./ci.nix {
+  inherit rust;
+  inherit spdk;
+  inherit spdk-path;
+}