Merge pull request #9425 from filecoin-project/packer-tweaks

_ci_: Fix failing Digital Ocean and Amazon Machine Image release process

.circleci/config.yml

@@ -140,7 +140,7 @@ commands:
       - run:
           name: "Run a packer build"
           command: packer build << parameters.args >> << parameters.template >>
-          no_output_timeout: 30m
+          no_output_timeout: 1h
 
 jobs:
   mod-tidy-check:
@@ -1265,10 +1265,10 @@ workflows:
       - publish-dockerhub:
           name: publish-dockerhub-nightly
           tag: nightly
-  monthly:
+  biweekly:
     triggers:
       - schedule:
-          cron: "0 0 1 * *"
+          cron: "0 0 1,15 * *"
           filters:
             branches:
               only:

.circleci/template.yml

@@ -140,7 +140,7 @@ commands:
       - run:
           name: "Run a packer build"
           command: packer build << parameters.args >> << parameters.template >>
-          no_output_timeout: 30m
+          no_output_timeout: 1h
 
 jobs:
   mod-tidy-check:
@@ -990,10 +990,10 @@ workflows:
       - publish-dockerhub:
           name: publish-dockerhub-nightly
           tag: nightly
-  monthly:
+  biweekly:
     triggers:
       - schedule:
-          cron: "0 0 1 * *"
+          cron: "0 0 1,15 * *"
           filters:
             branches:
               only:

tools/packer/lotus-snap.pkr.hcl

@@ -56,6 +56,11 @@ source "amazon-ebs" "lotus" {
     owners = ["099720109477"]
   }
   ssh_username = "ubuntu"
+
+  aws_polling {
+    delay_seconds = 60
+    max_attempts  = 60
+  }
 }
 
 source "digitalocean" "lotus" {
@@ -82,3 +87,4 @@ build {
     script = "./tools/packer/setup-snap.sh"
   }
 }
+

tools/packer/setup-snap.sh

@@ -23,13 +23,10 @@ MANAGED_FILES=(
 )
 
 # this is required on digitalocean, which does not have snap seeded correctly at this phase.
-apt update
-apt reinstall snapd
+apt-get -y update && apt-get -y reinstall snapd
 
 snap install lotus
 
-snap alias lotus.lotus lotus
-snap alias lotus.lotus-daemon lotus-daemon
 snap alias lotus.lotus-miner lotus-miner
 snap alias lotus.lotus-worker lotus-worker