summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2022-01-02 18:05:38 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2022-01-02 18:05:38 -0500
commitba05a4c67c061f99570bb3563756a0e8059ac221 (patch)
tree59d98c7c60f7bc7744331635a6ebc9af8b3daac7
parent4f7b81af94980e6bb7230d316f38e10a2826c711 (diff)
downloadcryptography-drop-zuul.tar.gz
Remove Zuul from our CIdrop-zuul
It was providing arm64 builds, but we now do those on CircleCI
-rw-r--r--.zuul.d/jobs.yaml52
-rw-r--r--.zuul.d/project.yaml12
-rw-r--r--.zuul.playbooks/playbooks/tox/main.yaml7
-rw-r--r--.zuul.playbooks/playbooks/tox/pre.yaml38
-rw-r--r--.zuul.playbooks/playbooks/wheel/main.yaml6
-rw-r--r--.zuul.playbooks/playbooks/wheel/pre.yaml42
-rw-r--r--.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/README.rst1
-rw-r--r--.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/files/build-wheels.sh53
-rw-r--r--.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/tasks/main.yaml88
-rw-r--r--MANIFEST.in3
10 files changed, 0 insertions, 302 deletions
diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
deleted file mode 100644
index e4029912f..000000000
--- a/.zuul.d/jobs.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-- job:
- name: pyca-cryptography-base
- abstract: true
- description: Run pyca/cryptography unit testing
- pre-run: .zuul.playbooks/playbooks/tox/pre.yaml
- run: .zuul.playbooks/playbooks/tox/main.yaml
-
-- job:
- name: pyca-cryptography-ubuntu-focal-py38-arm64
- parent: pyca-cryptography-base
- nodeset: ubuntu-focal-arm64
- vars:
- tox_envlist: py38
-
-- job:
- name: pyca-cryptography-build-wheel
- abstract: true
- pre-run: .zuul.playbooks/playbooks/wheel/pre.yaml
- run: .zuul.playbooks/playbooks/wheel/main.yaml
-
-- job:
- name: pyca-cryptography-build-wheel-arm64-manylinux2014
- parent: pyca-cryptography-build-wheel
- nodeset: ubuntu-focal-arm64
- vars:
- wheel_builds:
- - platform: manylinux2014_aarch64
- image: ghcr.io/pyca/cryptography-manylinux2014_aarch64
- pythons:
- - cp36-cp36m
-
-- job:
- name: pyca-cryptography-build-wheel-arm64-manylinux224
- parent: pyca-cryptography-build-wheel
- nodeset: ubuntu-focal-arm64
- vars:
- wheel_builds:
- - platform: manylinux_2_24_aarch64
- image: ghcr.io/pyca/cryptography-manylinux_2_24:aarch64
- pythons:
- - cp36-cp36m
-
-- job:
- name: pyca-cryptography-build-wheel-arm64-musllinux11
- parent: pyca-cryptography-build-wheel
- nodeset: ubuntu-focal-arm64
- vars:
- wheel_builds:
- - platform: musllinux_1_1_aarch64
- image: ghcr.io/pyca/cryptography-musllinux_1_1:aarch64
- pythons:
- - cp36-cp36m
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
deleted file mode 100644
index 458c3f4b8..000000000
--- a/.zuul.d/project.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
- check:
- jobs:
- - pyca-cryptography-build-wheel-arm64-manylinux2014
- - pyca-cryptography-build-wheel-arm64-manylinux224
- - pyca-cryptography-build-wheel-arm64-musllinux11
- - pyca-cryptography-ubuntu-focal-py38-arm64
- release:
- jobs:
- - pyca-cryptography-build-wheel-arm64-manylinux2014
- - pyca-cryptography-build-wheel-arm64-manylinux224
- - pyca-cryptography-build-wheel-arm64-musllinux11
diff --git a/.zuul.playbooks/playbooks/tox/main.yaml b/.zuul.playbooks/playbooks/tox/main.yaml
deleted file mode 100644
index 6243215bc..000000000
--- a/.zuul.playbooks/playbooks/tox/main.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- hosts: all
- tasks:
- - name: Run tox
- include_role:
- name: tox
- vars:
- tox_extra_args: "-- --wycheproof-root={{ ansible_facts.env['HOME'] }}/wycheproof/"
diff --git a/.zuul.playbooks/playbooks/tox/pre.yaml b/.zuul.playbooks/playbooks/tox/pre.yaml
deleted file mode 100644
index 33d3487a2..000000000
--- a/.zuul.playbooks/playbooks/tox/pre.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-- hosts: all
- tasks:
- - name: Clone wycheproof
- git:
- repo: https://github.com/google/wycheproof
- dest: "{{ ansible_facts.env['HOME'] }}/wycheproof"
- depth: 1
-
- - name: Install tox
- include_role:
- name: ensure-tox
-
- - name: Install required packages
- package:
- name:
- - build-essential
- - libssl-dev
- - libffi-dev
- - python3-dev
- become: yes
- when: ansible_distribution in ['Debian', 'Ubuntu']
-
- - name: Install required packages
- package:
- name:
- - redhat-rpm-config
- - gcc
- - libffi-devel
- - openssl-devel
- - python3-devel
- - python2-devel
- become: yes
- when: ansible_distribution == 'CentOS'
-
- - name: Install rust
- include_role:
- name: ensure-rust
-
diff --git a/.zuul.playbooks/playbooks/wheel/main.yaml b/.zuul.playbooks/playbooks/wheel/main.yaml
deleted file mode 100644
index 7fcdd82ef..000000000
--- a/.zuul.playbooks/playbooks/wheel/main.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- hosts: all
- tasks:
-
- - name: Build wheel
- include_role:
- name: build-wheel-manylinux
diff --git a/.zuul.playbooks/playbooks/wheel/pre.yaml b/.zuul.playbooks/playbooks/wheel/pre.yaml
deleted file mode 100644
index fd4283346..000000000
--- a/.zuul.playbooks/playbooks/wheel/pre.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-- hosts: all
- tasks:
- - name: Sanity check build list
- assert:
- that: wheel_builds is defined
-
- - name: Run ensure-docker
- include_role:
- name: ensure-docker
-
- - name: Workaround Linaro aarch64 cloud MTU issues
- # NOTE(ianw) : Docker default networking, the Linaro NAT setup and
- # *insert random things here* cause PMTU issues, resulting in hung
- # connections, particularly to fastly CDN (particularly annoying
- # because pypi and pythonhosted live behind that). Can remove after
- # upstream changes merge, or we otherwise find a solution in the
- # upstream cloud.
- # https://review.opendev.org/747062
- # https://review.opendev.org/746833
- # https://review.opendev.org/747064
- when: ansible_architecture == 'aarch64'
- block:
- - name: Install jq
- package:
- name: jq
- state: present
- become: yes
-
- - name: Reset docker MTU
- shell: |
- jq --arg mtu 1400 '. + {mtu: $mtu|tonumber}' /etc/docker/daemon.json > /etc/docker/daemon.json.new
- cat /etc/docker/daemon.json.new
- mv /etc/docker/daemon.json.new /etc/docker/daemon.json
- service docker restart
- become: yes
-
- - name: Pre-pull containers
- command: >-
- docker pull {{ item.image }}
- become: yes
- loop: '{{ wheel_builds }}'
-
diff --git a/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/README.rst b/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/README.rst
deleted file mode 100644
index 13c22d2cb..000000000
--- a/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/README.rst
+++ /dev/null
@@ -1 +0,0 @@
-Build manylinux wheels for cryptography
diff --git a/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/files/build-wheels.sh b/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/files/build-wheels.sh
deleted file mode 100644
index 216a83933..000000000
--- a/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/files/build-wheels.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash -ex
-
-# Compile wheels
-cd /io
-
-mkdir -p wheelhouse.final
-rm -rf build
-rm -rf dist
-
-for P in ${PYTHONS}; do
-
- PYBIN=/opt/python/${P}/bin
-
- "${PYBIN}"/python -m venv .venv
-
- .venv/bin/pip install -U pip wheel cffi setuptools-rust
-
- REGEX="cp3([0-9])*"
- if [[ "${PYBIN}" =~ $REGEX ]]; then
- PY_LIMITED_API="--py-limited-api=cp3${BASH_REMATCH[1]}"
- fi
-
- LDFLAGS="-L/opt/pyca/cryptography/openssl/lib" \
- CFLAGS="-I/opt/pyca/cryptography/openssl/include -Wl,--exclude-libs,ALL" \
- .venv/bin/python setup.py bdist_wheel $PY_LIMITED_API
-
- auditwheel repair --plat ${PLAT} -w wheelhouse/ dist/cryptography*.whl
-
- # Sanity checks
- # NOTE(ianw) : no execstack on aarch64, comes from
- # prelink, which was never supported. CentOS 8 does
- # have it separate, skip for now.
- if [[ ! "${PLAT}" =~ "aarch64" ]]; then
- for f in wheelhouse/*.whl; do
- unzip $f -d execstack.check
-
- results=$(execstack execstack.check/cryptography/hazmat/bindings/*.so)
- count=$(echo "$results" | grep -c '^X' || true)
- if [ "$count" -ne 0 ]; then
- exit 1
- fi
- rm -rf execstack.check
- done
- fi
-
- .venv/bin/pip install cryptography --no-index -f wheelhouse/
- .venv/bin/python -c "from cryptography.hazmat.backends.openssl.backend import backend;print('Loaded: ' + backend.openssl_version_text());print('Linked Against: ' + backend._ffi.string(backend._lib.OPENSSL_VERSION_TEXT).decode('ascii'))"
-
- # Cleanup
- mv wheelhouse/* wheelhouse.final
- rm -rf .venv dist wheelhouse
-
-done
diff --git a/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/tasks/main.yaml b/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/tasks/main.yaml
deleted file mode 100644
index 6c0ea6e2f..000000000
--- a/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/tasks/main.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-# Wheel builds is a list of dicts, with keys
-#
-# platform: the manylinux platform name
-# image: the docker image to build in
-# pythons: list of pythons in the image to build wheels for
-- name: Sanity check build list
- assert:
- that: wheel_builds is defined
-
-- name: Ensure pip installed
- include_role:
- name: ensure-pip
-
-# We build an sdist of the checkout, and then build wheels from the
-# sdist. This ensures that nothing is left out of the sdist.
-- name: Install setuptools-rust
- pip:
- name: setuptools-rust
- become: yes
-
-- name: Create sdist
- command: |
- python3 setup.py sdist
- args:
- chdir: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}'
-
-- name: Find output file
- find:
- paths: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/dist'
- file_type: file
- patterns: "*.tar.gz"
- register: _sdist
-
-- assert:
- that:
- - _sdist.matched == 1
-
-- name: Create a build area
- file:
- path: '{{ ansible_user_dir }}/build'
- state: directory
-
-- name: Create build area from sdist
- unarchive:
- src: '{{ _sdist.files[0].path }}'
- dest: '{{ ansible_user_dir }}/build'
- remote_src: yes
-
-- name: Find cryptography subdir from sdist build dir
- set_fact:
- _build_dir: "{{ ansible_user_dir }}/build/{{ _sdist.files[0].path | basename | replace('.tar.gz', '') }}"
-
-- name: Show _build_dir
- debug:
- var: _build_dir
-
-- name: Install build script
- copy:
- src: build-wheels.sh
- dest: '{{ _build_dir }}'
- mode: 0755
-
-- name: Run builds
- command: |
- docker run --rm \
- -e PLAT={{ item.platform }} \
- -e PYTHONS="{{ item.pythons | join(' ') }}" \
- -v {{ _build_dir }}:/io \
- {{ item.image }} \
- /io/build-wheels.sh
- become: yes
- loop: '{{ wheel_builds }}'
-
-- name: Copy wheels to output
- synchronize:
- src: '{{ _build_dir }}/wheelhouse.final/'
- dest: '{{ zuul.executor.log_root }}/wheelhouse'
- mode: pull
-
-- name: Return wheelhouse artifact
- zuul_return:
- data:
- zuul:
- artifacts:
- - name: "Wheelhouse"
- url: "wheelhouse"
- metadata:
- type: wheelhouse
diff --git a/MANIFEST.in b/MANIFEST.in
index e92077b32..0b6fabaf3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -21,7 +21,4 @@ recursive-exclude .github *
exclude release.py .coveragerc codecov.yml .readthedocs.yml dev-requirements.txt tox.ini mypy.ini
-recursive-exclude .zuul.d *
-recursive-exclude .zuul.playbooks *
-
recursive-exclude .circleci *