Hack to parallelize AMI copying

1 files changed, 11 insertions, 9 deletions

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index cd4195adcfaa3..8604091dbcdb9 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -191,15 +191,17 @@ for type in hvm pv; do
                 ami=$(cat $amiFile)
             fi
 
-            echo "waiting for AMI..."
-            while true; do
-                status=$(ec2-describe-images "$ami" --region "$region" | head -n1 | cut -f 5)
-                if [ "$status" = available ]; then break; fi
-                sleep 10
-            done
-
-            ec2-modify-image-attribute \
-                --region "$region" "$ami" -l -a all
+            if [ -z "$NO_WAIT" -o -z "$prevAmi" ]; then
+                echo "waiting for AMI..."
+                while true; do
+                    status=$(ec2-describe-images "$ami" --region "$region" | head -n1 | cut -f 5)
+                    if [ "$status" = available ]; then break; fi
+                    sleep 10
+                done
+
+                ec2-modify-image-attribute \
+                    --region "$region" "$ami" -l -a all
+            fi
 
             echo "region = $region, type = $type, store = $store, ami = $ami"
             if [ -z "$prevAmi" ]; then