From c19ee3937dfd69f7b7e91000142aaa48e4a0163f Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Tue, 25 Aug 2020 16:44:20 -0700
Subject: [PATCH] Try switching to the buster ARM image.

---
 tests/letstest/apache2_targets.yaml    | 12 ++++++------
 tests/letstest/scripts/test_apache2.sh |  2 +-
 tests/letstest/targets.yaml            | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/letstest/apache2_targets.yaml b/tests/letstest/apache2_targets.yaml
index d584705ca..2fa64568c 100644
--- a/tests/letstest/apache2_targets.yaml
+++ b/tests/letstest/apache2_targets.yaml
@@ -8,12 +8,6 @@ targets:
     type: ubuntu
     virt: hvm
     user: ubuntu
-  - ami: ami-008680ee60f23c94b
-    name: ubuntu20.04_arm64
-    type: ubuntu
-    virt: hvm
-    user: ubuntu
-    machine_type: a1.medium
   - ami: ami-0545f7036167eb3aa
     name: ubuntu19.10
     type: ubuntu
@@ -36,6 +30,12 @@ targets:
     type: ubuntu
     virt: hvm
     user: admin
+  - ami: ami-0dcd54b7d2fff584f
+    name: debian10_arm64
+    type: ubuntu
+    virt: hvm
+    user: admin
+    machine_type: a1.medium
   - ami: ami-003f19e0e687de1cd
     name: debian9
     type: ubuntu
diff --git a/tests/letstest/scripts/test_apache2.sh b/tests/letstest/scripts/test_apache2.sh
index e39cee9ef..ba3d94379 100755
--- a/tests/letstest/scripts/test_apache2.sh
+++ b/tests/letstest/scripts/test_apache2.sh
@@ -12,7 +12,7 @@ then
     # For apache 2.4, set up ServerName
     sudo sed -i '/ServerName/ s/#ServerName/ServerName/' $CONFFILE
     sudo sed -i '/ServerName/ s/www.example.com/'$PUBLIC_HOSTNAME'/' $CONFFILE
-    if [ $(python3 -V 2>&1 | cut -d" " -f 2 | cut -d. -f1,2 | sed 's/\.//') -ne 38 ]
+    if [ $(python3 -V 2>&1 | cut -d" " -f 2 | cut -d. -f1,2 | sed 's/\.//') -lt 36 ]
     then
         # Upgrade python version using pyenv because py3.5 is deprecated
         # Don't upgrade if it's already 3.8 because pyenv doesn't work great on arm, and
diff --git a/tests/letstest/targets.yaml b/tests/letstest/targets.yaml
index 711053469..f6d3dd42f 100644
--- a/tests/letstest/targets.yaml
+++ b/tests/letstest/targets.yaml
@@ -8,12 +8,6 @@ targets:
     type: ubuntu
     virt: hvm
     user: ubuntu
-  - ami: ami-008680ee60f23c94b
-    name: ubuntu20.04_arm64
-    type: ubuntu
-    virt: hvm
-    user: ubuntu
-    machine_type: a1.medium
   - ami: ami-0545f7036167eb3aa
     name: ubuntu19.10
     type: ubuntu
@@ -31,6 +25,12 @@ targets:
     type: ubuntu
     virt: hvm
     user: admin
+  - ami: ami-0dcd54b7d2fff584f
+    name: debian10_arm64
+    type: ubuntu
+    virt: hvm
+    user: admin
+    machine_type: a1.medium
   #-----------------------------------------------------------------------------
   # Other Redhat Distros
   - ami: ami-0916c408cb02e310b