fix(ci): allowing bors try when submodule PR is not merged yet

Signed-off-by: Dmitry Savitskiy <[email protected]>
openebs · Jul 20, 2023 · 040a557 · 040a557
1 parent b4c13c9
commit 040a557
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -140,6 +140,7 @@ pipeline {
           anyOf {
             branch 'master'
             branch 'release/*'
+            branch 'trying'
             expression { run_linter == false }
           }
         }

diff --git a/io-engine/src/rebuild/rebuild_task.rs b/io-engine/src/rebuild/rebuild_task.rs
@@ -220,17 +220,26 @@ impl RebuildTask {
             return Ok(());
         }
 
+        let msg = format!(
+            "Rebuild job '{src}' -> '{dst}': verification failed",
+            src = desc.src_uri,
+            dst = desc.dst_uri
+        );
+
         match desc.options.verify_mode {
-            RebuildVerifyMode::None => Ok(()),
-            RebuildVerifyMode::Fail => Err(RebuildError::VerifyCompareFailed {
-                bdev: desc.dst_uri.clone(),
-            }),
+            RebuildVerifyMode::None => {
+                error!("{msg}: ignoring");
+                Ok(())
+            }
+            RebuildVerifyMode::Fail => {
+                error!("{msg}: failing rebuild");
+                Err(RebuildError::VerifyCompareFailed {
+                    bdev: desc.dst_uri.clone(),
+                })
+            }
             RebuildVerifyMode::Panic => {
-                panic!(
-                    "Rebuild job '{src}' -> '{dst}': verification failed",
-                    src = desc.src_uri,
-                    dst = desc.dst_uri
-                );
+                error!("{msg}: will panic");
+                panic!("{}", msg);
             }
         }
     }