fix: upgrade_test on local

Author: fraidev

crates/fluvio-cluster/src/cli/upgrade.rs

@@ -1,7 +1,10 @@
+use std::time::Duration;
+
 use clap::Parser;
 use color_eyre::owo_colors::OwoColorize;
 use colored::Colorize;
 use fluvio_extension_common::installation::InstallationType;
+use fluvio_future::timer::sleep;
 use fluvio_sc_schema::{
     mirror::MirrorSpec, partition::PartitionSpec, smartmodule::SmartModuleSpec, spg::SpuGroupSpec,
     spu::SpuSpec, store::NameSpace, tableformat::TableFormatSpec, topic::TopicSpec,
@@ -76,6 +79,7 @@ impl UpgradeOpt {
                     }
                 };
                 ShutdownOpt.process().await?;
+                sleep(Duration::from_secs(10)).await;
                 if let Err(err) = self.upgrade_local_cluster(&pb, platform_version).await {
                     pb.println(format!("💔 {}", err.to_string().red()));
                 }

makefiles/build.mk

@@ -48,6 +48,8 @@ ifeq (${CI},true)
 build_k8_image:
 else ifeq (${IMAGE_VERSION},true)
 build_k8_image:
+else ifeq (${FLUVIO_MODE},local)
+build_k8_image:
 else
 # When not in CI (i.e. development), build image before testing
 build_k8_image: fluvio_image

tests/upgrade-test.sh

@@ -28,7 +28,7 @@ fi
 
 readonly STABLE=${1:-stable}
 readonly PRERELEASE=${2:-$(cat VERSION)-$(git rev-parse HEAD)}
-readonly CI_SLEEP=${CI_SLEEP:-5}
+readonly CI_SLEEP=${CI_SLEEP:-1}
 readonly CI=${CI:-}
 readonly STABLE_TOPIC=${STABLE_TOPIC:-stable}
 readonly PRERELEASE_TOPIC=${PRERELEASE_TOPIC:-prerelease}
@@ -52,7 +52,11 @@ function cleanup() {
 # If we're in CI, we want to slow down execution
 # to give CPU some time to rest, so we don't time out
 function ci_check() {
-    :
+    if [[ "$FLUVIO_MODE" == "local" ]]; then
+        sleep $CI_SLEEP
+    else
+        :
+    fi
 }
 
 # This function is intended to be run second after the Stable-1 validation
@@ -97,13 +101,15 @@ function validate_cluster_stable() {
     # $STABLE_FLUVIO topic create ${STABLE_TOPIC}-delete 
     ci_check;
 
-    echo "Create mirror"
-    $STABLE_FLUVIO remote register stable-remote
+    # echo "Create mirror"
+    # $STABLE_FLUVIO remote register stable-remote
+    # ci_check;
 
     # Validate consume on topic before produce
     # https://github.com/infinyon/fluvio/issues/1819
     echo "Validate consume on \"${STABLE_TOPIC}\" before producing"
     $STABLE_FLUVIO consume -B -d ${STABLE_TOPIC} 2>/dev/null
+    ci_check;
 
     echo "Producing test data to ${STABLE_TOPIC}"
     cat data1.txt.tmp | $STABLE_FLUVIO produce ${STABLE_TOPIC}
@@ -128,6 +134,7 @@ function validate_cluster_stable() {
 
 
     $STABLE_FLUVIO partition list
+    ci_check;
 
 }
 
@@ -151,7 +158,7 @@ function validate_upgrade_cluster_to_prerelease() {
         ~/.fvm/bin/fvm install latest | tee /tmp/installer.output 
         # expectd output fvm current => 0.11.0-dev-1+hash (latest)
         DEV_VERSION=$(~/.fvm/bin/fvm current | awk '{print $1}')
-        TARGET_VERSION=${PRERELEASE:0:${#PRERELEASE}-41}
+        TARGET_VERSION=${DEV_VERSION:0:${#DEV_VERSION}-41}
 
         echo "Installed CLI version ${DEV_VERSION}"
         echo "Upgrading cluster to ${DEV_VERSION}"
@@ -172,11 +179,12 @@ function validate_upgrade_cluster_to_prerelease() {
     fi
     if [[ "$FLUVIO_MODE" == "local" ]]; then
 	echo "Resuming local cluster"
-	sleep 5
+	ci_check;
 	$FLUVIO_BIN_ABS_PATH cluster resume
     fi
     popd
 
+    ci_check;
 
     # Validate that the development version output matches the expected version from installer output
     $FLUVIO_BIN_ABS_PATH version
@@ -324,6 +332,8 @@ function main() {
     echo "Update cluster to stable v${STABLE}. Create and validate data."
     validate_cluster_stable;
 
+    ci_check;
+
     echo "Update cluster to prerelease v${PRERELEASE}"
     validate_upgrade_cluster_to_prerelease;