Merge pull request juju#11662 from ycliuhw/fix/OCI-fetch

Exit 0 if anything was wrong in OCI image fetching;
orbital-transfer-survey · Jun 3, 2020 · d816abe · d816abe
2 parents 86cf21f + c1fbeeb
commit d816abe
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/snap/local/wrappers/fetch-oci b/snap/local/wrappers/fetch-oci
@@ -20,7 +20,11 @@ if ! which $container_cmd; then
 fi
 
 echo "Wait for microk8s to be ready if needed."
-microk8s.status --wait-ready --timeout 30
+wait_result=$(microk8s.status --wait-ready --timeout 30 2>&1)
+if [ $? -ne 0 ]; then
+    echo "${wait_result}"
+    exit 0
+fi
 
 juju_version=$(/snap/bin/juju version | rev | cut -d- -f3- | rev)
 oci_image="docker.io/jujusolutions/jujud-operator:$juju_version"