From e066766cc97adec395d93f0644ffa20be8cb0e20 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 28 Sep 2020 14:27:29 -0700 Subject: [PATCH] Revert "Disable build isolation during snap dns plugins build (#8319)" (#8323) This reverts commit feca125437ef1d51ed8cd31a70f45ca46b8f46d2. Since this change landed, ARM builds for many of the DNS plugins have failed every night. See https://dev.azure.com/certbot/certbot/_build?definitionId=5 or our public Mattermost channel. I quickly tried to fix this myself and wasn't trivially able to do so. I tried setting `SNAPCRAFT_PYTHON_VENV_ARGS: --system-site-packages` and adding `python3-wheel` as a build dependency, but it didn't work for some reason. The `python3-wheel` package didn't seem to be installed. I still suspect something like this is the approach we should take, however, I want to fix the failing tests now so things are no longer broken in `master` and those of us on the Certbot team at EFF stop getting spammed with 54 (!!) emails about failed builds from launchpad every night. Unfortunately, while I was working on this the queue for ARM machines on Launchpad jumped up to an estimated ~20 hour wait, but I confirmed that this fixes the problem by building on an ARM AMI using the instructions at https://github.com/certbot/certbot/blob/master/tools/snap/README.md#use-testing-and-development. If whoever reviews this would like an ARM machine to test on themselves, please let me know. --- certbot-dns-cloudflare/snap/snapcraft.yaml | 1 - certbot-dns-cloudxns/snap/snapcraft.yaml | 1 - certbot-dns-digitalocean/snap/snapcraft.yaml | 1 - certbot-dns-dnsimple/snap/snapcraft.yaml | 1 - certbot-dns-dnsmadeeasy/snap/snapcraft.yaml | 1 - certbot-dns-gehirn/snap/snapcraft.yaml | 1 - certbot-dns-google/snap/snapcraft.yaml | 1 - certbot-dns-linode/snap/snapcraft.yaml | 1 - certbot-dns-luadns/snap/snapcraft.yaml | 1 - certbot-dns-nsone/snap/snapcraft.yaml | 1 - certbot-dns-ovh/snap/snapcraft.yaml | 1 - certbot-dns-rfc2136/snap/snapcraft.yaml | 1 - certbot-dns-route53/snap/snapcraft.yaml | 1 - certbot-dns-sakuracloud/snap/snapcraft.yaml | 1 - tools/snap/generate_dnsplugins_snapcraft.sh | 1 - 15 files changed, 15 deletions(-) diff --git a/certbot-dns-cloudflare/snap/snapcraft.yaml b/certbot-dns-cloudflare/snap/snapcraft.yaml index 63fc98e03..2e520dcfa 100644 --- a/certbot-dns-cloudflare/snap/snapcraft.yaml +++ b/certbot-dns-cloudflare/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-cloudxns/snap/snapcraft.yaml b/certbot-dns-cloudxns/snap/snapcraft.yaml index 89fa1489b..29a63cfa7 100644 --- a/certbot-dns-cloudxns/snap/snapcraft.yaml +++ b/certbot-dns-cloudxns/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-digitalocean/snap/snapcraft.yaml b/certbot-dns-digitalocean/snap/snapcraft.yaml index 48b3482f4..17027ce16 100644 --- a/certbot-dns-digitalocean/snap/snapcraft.yaml +++ b/certbot-dns-digitalocean/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-dnsimple/snap/snapcraft.yaml b/certbot-dns-dnsimple/snap/snapcraft.yaml index 926d40b7d..df0c4f608 100644 --- a/certbot-dns-dnsimple/snap/snapcraft.yaml +++ b/certbot-dns-dnsimple/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-dnsmadeeasy/snap/snapcraft.yaml b/certbot-dns-dnsmadeeasy/snap/snapcraft.yaml index 9a012440d..b7a20ce30 100644 --- a/certbot-dns-dnsmadeeasy/snap/snapcraft.yaml +++ b/certbot-dns-dnsmadeeasy/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-gehirn/snap/snapcraft.yaml b/certbot-dns-gehirn/snap/snapcraft.yaml index 147508dbc..de913e894 100644 --- a/certbot-dns-gehirn/snap/snapcraft.yaml +++ b/certbot-dns-gehirn/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-google/snap/snapcraft.yaml b/certbot-dns-google/snap/snapcraft.yaml index fbe002392..7222ea83c 100644 --- a/certbot-dns-google/snap/snapcraft.yaml +++ b/certbot-dns-google/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-linode/snap/snapcraft.yaml b/certbot-dns-linode/snap/snapcraft.yaml index 937ad27d5..67090b5a2 100644 --- a/certbot-dns-linode/snap/snapcraft.yaml +++ b/certbot-dns-linode/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-luadns/snap/snapcraft.yaml b/certbot-dns-luadns/snap/snapcraft.yaml index c30c4fbd2..14806d44a 100644 --- a/certbot-dns-luadns/snap/snapcraft.yaml +++ b/certbot-dns-luadns/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-nsone/snap/snapcraft.yaml b/certbot-dns-nsone/snap/snapcraft.yaml index 7e96dfc2d..b2d46ea36 100644 --- a/certbot-dns-nsone/snap/snapcraft.yaml +++ b/certbot-dns-nsone/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-ovh/snap/snapcraft.yaml b/certbot-dns-ovh/snap/snapcraft.yaml index a2e492d66..f9e057dc4 100644 --- a/certbot-dns-ovh/snap/snapcraft.yaml +++ b/certbot-dns-ovh/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-rfc2136/snap/snapcraft.yaml b/certbot-dns-rfc2136/snap/snapcraft.yaml index a9fb84a80..b247e031b 100644 --- a/certbot-dns-rfc2136/snap/snapcraft.yaml +++ b/certbot-dns-rfc2136/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-route53/snap/snapcraft.yaml b/certbot-dns-route53/snap/snapcraft.yaml index 50722c25d..a6cc6487a 100644 --- a/certbot-dns-route53/snap/snapcraft.yaml +++ b/certbot-dns-route53/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/certbot-dns-sakuracloud/snap/snapcraft.yaml b/certbot-dns-sakuracloud/snap/snapcraft.yaml index 4314a0cfa..6d87ef401 100644 --- a/certbot-dns-sakuracloud/snap/snapcraft.yaml +++ b/certbot-dns-sakuracloud/snap/snapcraft.yaml @@ -17,7 +17,6 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: diff --git a/tools/snap/generate_dnsplugins_snapcraft.sh b/tools/snap/generate_dnsplugins_snapcraft.sh index b2ec2d291..4e589f846 100755 --- a/tools/snap/generate_dnsplugins_snapcraft.sh +++ b/tools/snap/generate_dnsplugins_snapcraft.sh @@ -29,7 +29,6 @@ parts: snapcraftctl set-version \`grep ^version \$SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"\` build-environment: - SNAP_BUILD: "True" - - PIP_NO_BUILD_ISOLATION: "no" # To build cryptography and cffi if needed build-packages: [gcc, libffi-dev, libssl-dev, python3-dev] certbot-metadata: