ci(stability): merge the develop branch

openebs · Nov 29, 2024 · 34afccf · 34afccf
2 parents be3c827 + ed25e5a
commit 34afccf
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 28 deletions.
diff --git a/.rustfmt.toml b/.rustfmt.toml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dependencies/control-plane b/dependencies/control-plane
diff --git a/k8s/upgrade/src/bin/upgrade-job/upgrade/utils.rs b/k8s/upgrade/src/bin/upgrade-job/upgrade/utils.rs
@@ -50,7 +50,7 @@ pub(crate) async fn rebuild_result(
             if volume_over_nodes.contains(node_name) {
                 match replica_rebuild_count(volume) {
                     0 => {
-                        for _i in 0 .. 11 {
+                        for _i in 0..11 {
                             // wait for a minute for any rebuild to start
                             tokio::time::sleep(Duration::from_secs(60_u64)).await;
                             let count = replica_rebuild_count(volume);

diff --git a/k8s/upgrade/src/plugin/upgrade.rs b/k8s/upgrade/src/plugin/upgrade.rs
@@ -162,7 +162,7 @@ impl UpgradeArgs {
         // Create resources for upgrade
         UpgradeResources::create_upgrade_resources(namespace, self).await?;
 
-        for _i in 0 .. MAX_RETRY_ATTEMPTS {
+        for _i in 0..MAX_RETRY_ATTEMPTS {
             // wait for 10 seconds for the upgrade event to be published
             tokio::time::sleep(Duration::from_secs(10)).await;
             match upgrade_event_client

diff --git a/shell.nix b/shell.nix
@@ -1,4 +1,4 @@
-{ norust ? false, devrustup ? true, rust-profile ? "nightly" }:
+{ norust ? false, devrustup ? true, rust-profile ? "stable" }:
 let
   sources = import ./nix/sources.nix;
   pkgs = import sources.nixpkgs {
@@ -46,7 +46,7 @@ mkShell {
     which
     yq-go
     kind
-  ] ++ pkgs.lib.optional (!norust) channel.default_src.nightly
+  ] ++ pkgs.lib.optional (!norust) rust
   ++ pkgs.lib.optional (system == "aarch64-darwin") darwin.apple_sdk.frameworks.Security;
 
   PROTOC = "${protobuf}/bin/protoc";

diff --git a/tests/bdd/requirements.txt b/tests/bdd/requirements.txt
@@ -1,6 +1,6 @@
 kubernetes==31.0.0
 pytest-bdd==7.3.0
 pytest==8.3.3
-requests==2.26.0
+requests==2.32.3
 retrying==1.3.4
 semver==3.0.2