From 2e06fac486f2055c89870e8c3ec0dcd2c93710ca Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Thu, 9 Apr 2020 14:08:38 -0700
Subject: [PATCH] start merging .travis.yml

---
 .travis.yml      | 21 +++++++++++++++++++++
 snap/.travis.yml | 27 ---------------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d3eeb1e03..f3f3bd9eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -223,6 +223,26 @@ matrix:
           packages:  # don't install nginx and apache
             - libaugeas0
       <<: *extended-test-suite
+    - sudo: required
+      before_script:
+        - sudo snapcraft --use-lxd
+      install:
+        - sudo /snap/bin/lxd.migrate -yes
+        - sudo /snap/bin/lxd waitready
+        - sudo /snap/bin/lxd init --auto
+        - tools/strip_hashes.py letsencrypt-auto-source/pieces/dependency-requirements.txt > constraints.txt
+      script:
+        - sudo snap install --dangerous --classic *.snap
+        - sudo bash snap/test.sh
+      addons:
+        snaps:
+          - name: snapcraft
+            # TODO: move back to stable channel once snapcraft 3.10 has been pushed to it.
+            channel: candidate
+            classic: true
+          - name: lxd
+            channel: stable
+      <<: *extended-test-suite
 
 # container-based infrastructure
 sudo: false
@@ -231,6 +251,7 @@ addons:
   apt:
     packages:  # Keep in sync with letsencrypt-auto-source/pieces/bootstrappers/deb_common.sh and Boulder.
     - python-dev
+    - python3-dev
     - gcc
     - libaugeas0
     - libssl-dev
diff --git a/snap/.travis.yml b/snap/.travis.yml
index 125893985..d1925c5a8 100644
--- a/snap/.travis.yml
+++ b/snap/.travis.yml
@@ -1,18 +1,3 @@
-language: python
-before_install:
-  - sudo -E apt-get -yq --no-install-suggests --no-install-recommends install nginx-light python3-venv
-  - sudo -E /etc/init.d/nginx stop
-install:
-  - sudo /snap/bin/lxd.migrate -yes
-  - sudo /snap/bin/lxd waitready
-  - sudo /snap/bin/lxd init --auto
-  - git clone https://github.com/certbot/certbot.git certbot --branch master
-  - certbot/tools/strip_hashes.py certbot/letsencrypt-auto-source/pieces/dependency-requirements.txt > certbot/constraints.txt
-before_script:
-  - sudo snapcraft --use-lxd
-script:
-  - sudo snap install --dangerous --classic *.snap
-  - sudo bash test.sh
 deploy:
   'on':
     branch: master
@@ -20,15 +5,3 @@ deploy:
   snap: certbot_*.snap
   channel: edge
   skip_cleanup: true
-notifications:
-  email:
-    recipients: [robie.basak@canonical.com]
-    on_failure: change
-addons:
-  snaps:
-    - name: snapcraft
-      # TODO: move back to stable channel once snapcraft 3.10 has been pushed to it.
-      channel: candidate
-      classic: true
-    - name: lxd
-      channel: stable