Be more lenient when looking up resources package

Author: swallez

xtask/src/artifacts.rs

@@ -84,8 +84,10 @@ pub fn download(commit_hash: Option<String>, url: Option<String>) -> anyhow::Res
 
     let specs_url = project
         .packages
-        .get(&format!("rest-resources-zip-{}.zip", *STACK_VERSION))
+        .iter()
+        .find(|(name, _)| name.starts_with("rest-resources-zip-"))
         .with_context(|| "Package 'rest-resources-zip' not found")?
+        .1
         .url
         .clone();
 

yaml_test_runner/src/main.rs

@@ -76,7 +76,13 @@ fn main() -> anyhow::Result<()> {
 
     let stack_version = std::env::var("STACK_VERSION").expect("Missing STACK_VERSION env var");
 
-    if version != stack_version {
+    let valid_version = if let Some(pos) = stack_version.find(".x-SNAPSHOT") {
+        &version[0..pos] == &stack_version[0..pos] && version.ends_with("-SNAPSHOT")
+    } else {
+        version != stack_version
+    };
+
+    if !valid_version {
         bail!(
             "ES server version {} is inconsistent with STACK_VERSION={}",
             version,