Skip to content

Commit ca3dd76

Browse files
pombredannepombredanne
committed
Improve Debian source build. Build all containers
Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent e1fb26c commit ca3dd76

File tree

5 files changed

+178
-201
lines changed

5 files changed

+178
-201
lines changed

‎azure-pipelines.yml‎

Lines changed: 168 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -10,187 +10,203 @@ pr:
1010
include: ['*']
1111

1212
jobs:
13-
# - template: etc/ci/azure-posix.yml
14-
# parameters:
15-
# name: Ubuntu_16
16-
# image_name: ubuntu-16.04
17-
# matrix:
18-
# Python_27_Linux:
19-
# python_version: '2.7'
20-
# Python_36_Linux:
21-
# python_version: '3.6'
22-
# Python_37_Linux:
23-
# python_version: '3.7'
24-
#
25-
# - template: etc/ci/azure-posix.yml
26-
# parameters:
27-
# name: macOS_1013
28-
# image_name: macos-10.13
29-
# matrix:
30-
# Python_27_Mac:
31-
# python_version: '2.7'
32-
# Python_36_Mac:
33-
# python_version: '3.6'
34-
# Python_37_Mac:
35-
# python_version: '3.7'
36-
#
37-
# - template: etc/ci/azure-posix.yml
38-
# parameters:
39-
# name: macOS_1014
40-
# image_name: macos-10.14
41-
# matrix:
42-
# Python_27_Mac:
43-
# python_version: '2.7'
44-
# Python_36_Mac:
45-
# python_version: '3.6'
46-
# Python_37_Mac:
47-
# python_version: '3.7'
48-
#
49-
# - template: etc/ci/azure-win.yml
50-
# parameters:
51-
# name: Windows_2016_32
52-
# image_name: vs2017-win2016
53-
# matrix:
54-
# Python_27_Win32:
55-
# python_version: '2.7'
56-
# python_architecture: 'x86'
57-
# Python_36_Win32:
58-
# python_version: '3.6'
59-
# python_architecture: 'x86'
60-
# Python_37_Win32:
61-
# python_version: '3.7.3'
62-
# python_architecture: 'x86'
63-
#
64-
# - template: etc/ci/azure-win.yml
65-
# parameters:
66-
# name: Windows_2016_64
67-
# image_name: vs2017-win2016
68-
# matrix:
69-
# Python_27_Win64:
70-
# python_version: '2.7'
71-
# python_architecture: 'x64'
72-
# Python_36_Win64:
73-
# python_version: '3.6'
74-
# python_architecture: 'x64'
75-
# Python_37_Win64:
76-
# python_version: '3.7'
77-
# python_architecture: 'x64'
78-
#
79-
#
80-
#
81-
# - template: etc/ci/azure-container-deb.yml
82-
# parameters:
83-
# name: Ubuntu_16_xenial_py27
84-
# container: 'ubuntu:xenial'
85-
# python_version: '2.7'
86-
# install_python: sudo apt-get install -y python python-dev
13+
- template: etc/ci/azure-posix.yml
14+
parameters:
15+
name: Ubuntu_16
16+
image_name: ubuntu-16.04
17+
matrix:
18+
Python_27_Linux:
19+
python_path: 'python2.7'
20+
Python_36_Linux:
21+
python_path: 'python3.6'
22+
Python_37_Linux:
23+
python_version: '3.7'
24+
25+
- template: etc/ci/azure-posix.yml
26+
parameters:
27+
name: macOS_1013
28+
image_name: macos-10.13
29+
matrix:
30+
Python_27_Mac:
31+
python_path: 'python2.7'
32+
Python_36_Mac:
33+
python_path: 'python3.6'
34+
Python_37_Mac:
35+
python_version: '3.7'
36+
37+
- template: etc/ci/azure-posix.yml
38+
parameters:
39+
name: macOS_1014
40+
image_name: macos-10.14
41+
matrix:
42+
Python_27_Mac:
43+
python_path: 'python2.7'
44+
Python_36_Mac:
45+
python_path: 'python3.6'
46+
Python_37_Mac:
47+
python_version: '3.7'
48+
49+
- template: etc/ci/azure-win.yml
50+
parameters:
51+
name: Windows_2016_32
52+
image_name: vs2017-win2016
53+
matrix:
54+
Python_27_Win32:
55+
python_path: 'python2.7'
56+
python_architecture: 'x86'
57+
Python_36_Win32:
58+
python_path: 'python3.6'
59+
python_architecture: 'x86'
60+
Python_37_Win32:
61+
python_version: '3.7.3'
62+
python_architecture: 'x86'
63+
64+
- template: etc/ci/azure-win.yml
65+
parameters:
66+
name: Windows_2016_64
67+
image_name: vs2017-win2016
68+
matrix:
69+
Python_27_Win64:
70+
python_path: 'python2.7'
71+
python_architecture: 'x64'
72+
Python_36_Win64:
73+
python_path: 'python3.6'
74+
python_architecture: 'x64'
75+
Python_37_Win64:
76+
python_version: '3.7'
77+
python_architecture: 'x64'
78+
79+
- template: etc/ci/azure-container-deb.yml
80+
parameters:
81+
name: Ubuntu_16_xenial_py27
82+
container: 'ubuntu:xenial'
83+
python_path: 'python2.7'
84+
install_python: sudo apt-get install -y python python-dev
8785

8886
- template: etc/ci/azure-container-deb.yml
8987
parameters:
9088
name: Ubuntu_16_xenial_py36
9189
container: 'ubuntu:xenial'
92-
python_version: '3.6'
90+
python_path: 'python3.6'
9391
install_python: |
9492
sudo apt-get -y install software-properties-common
9593
sudo add-apt-repository -y ppa:deadsnakes
9694
sudo apt-get -y update
9795
sudo apt-get install -y python3.6 python3.6-venv python3.6-dev
9896
99-
# - template: etc/ci/azure-container-deb.yml
100-
# parameters:
101-
# name: Ubuntu_18_Bionic_py27
102-
# container: 'ubuntu:bionic'
103-
# python_version: '2.7'
104-
# install_python: sudo apt-get install -y python python-dev
97+
- template: etc/ci/azure-container-deb.yml
98+
parameters:
99+
name: Ubuntu_18_Bionic_py27
100+
container: 'ubuntu:bionic'
101+
python_path: 'python2.7'
102+
install_python: sudo apt-get install -y python python-dev
105103

106104
- template: etc/ci/azure-container-deb.yml
107105
parameters:
108106
name: Ubuntu_18_Bionic_py36
109107
container: 'ubuntu:bionic'
110-
python_version: '3.6'
108+
python_path: 'python3.6'
111109
install_python: sudo apt-get install -y python3.6 python3.6-venv python3.6-dev
112110

113-
# set -ex
114-
# sudo apt-get -y install software-properties-common
115-
# sudo add-apt-repository -y ppa:deadsnakes
116-
# sudo apt-get -y update
117-
# sudo apt-get install -y python3.6 python3.6-venv python3.6-dev
118-
#
119-
# - template: etc/ci/azure-container-deb.yml
120-
# parameters:
121-
# name: Debian_9_Stretch_py27
122-
# container: 'debian:stretch'
123-
# python_version: '2.7'
124-
# install_python: sudo apt-get install -y python python-dev
111+
- template: etc/ci/azure-container-deb.yml
112+
parameters:
113+
name: Debian_9_Stretch_py27
114+
container: 'debian:stretch'
115+
python_path: 'python2.7'
116+
install_python: sudo apt-get install -y python python-dev
125117

126118
- template: etc/ci/azure-container-deb.yml
127119
parameters:
128120
name: Debian_9_Stretch_py36
129121
container: 'debian:stretch'
130-
python_version: '3.6'
122+
python_path: 'python3.6'
131123
install_python: |
132-
set -ex
133-
sudo apt-get install -y curl
134-
PYVER=3.6.8
124+
set -e -x
125+
sudo apt-get install -y \
126+
libncurses5-dev libncursesw5-dev libreadline6-dev \
127+
libdb-dev libgdbm-dev libsqlite3-dev libssl-dev \
128+
libbz2-dev libexpat1-dev liblzma-dev zlib1g-dev \
129+
libcurl4-openssl-dev libpam0g-dev \
130+
libsqlite3-dev tk-dev libffi-dev \
131+
curl
132+
export PYVER=3.6.8
135133
curl -o Python-$PYVER.tgz https://www.python.org/ftp/python/$PYVER/Python-$PYVER.tgz
136134
tar -xvf Python-$PYVER.tgz
137135
cd Python-$PYVER
138136
./configure --enable-optimizations
139137
make -j8
140138
sudo make altinstall
141139
140+
- template: etc/ci/azure-container-rpm.yml
141+
parameters:
142+
name: CentOS7_py27
143+
container: 'centos:7'
144+
python_path: 'python2.7'
145+
install_python: sudo yum install -y python python27-devel
146+
147+
- template: etc/ci/azure-container-rpm.yml
148+
parameters:
149+
name: CentOS7_py36
150+
container: 'centos:7'
151+
python_path: 'python3.6'
152+
install_python: |
153+
set -e -x
154+
sudo yum install -y epel-release
155+
sudo yum install -y python36 python36-devel python36-virtualenv
156+
157+
- template: etc/ci/azure-container-rpm.yml
158+
parameters:
159+
name: Fedora_30_py27
160+
container: 'fedora:30'
161+
package_manager: dnf
162+
python_path: 'python2.7'
163+
install_python: sudo dnf install -y python python27-devel
164+
165+
- template: etc/ci/azure-container-rpm.yml
166+
parameters:
167+
name: Fedora_30_py36
168+
container: 'fedora:30'
169+
package_manager: dnf
170+
python_path: 'python3.6'
171+
install_python: sudo dnf install -y python36 python36-devel python36-virtualenv
172+
173+
- template: etc/ci/azure-container-rpm.yml
174+
parameters:
175+
name: Manylinux1_64_py27
176+
container: 'quay.io/pypa/manylinux1_x86_64:latest'
177+
python_path: '/opt/python/cp27-cp27mu/bin/python'
178+
install_packages: echo "No extra packages for now"
179+
install_python: echo "Python is pre-installed"
180+
181+
- template: etc/ci/azure-container-rpm.yml
182+
parameters:
183+
name: Manylinux1_64_py36
184+
container: 'quay.io/pypa/manylinux1_x86_64:latest'
185+
python_path: '/opt/python/cp36-cp36m/bin/python'
186+
install_packages: echo "No extra packages for now"
187+
install_python: echo "Python is pre-installed"
188+
189+
- template: etc/ci/azure-container-rpm.yml
190+
parameters:
191+
name: Manylinux2010_64_py27
192+
container: 'quay.io/pypa/manylinux2010_x86_64:latest'
193+
python_path: '/opt/python/cp27-cp27mu/bin/python'
194+
install_packages: echo "No extra packages for now"
195+
install_python: echo "Python is pre-installed"
196+
197+
- template: etc/ci/azure-container-rpm.yml
198+
parameters:
199+
name: Manylinux2010_64_py36
200+
container: 'quay.io/pypa/manylinux2010_x86_64:latest'
201+
python_path: '/opt/python/cp36-cp36m/bin/python'
202+
install_packages: echo "No extra packages for now"
203+
install_python: echo "Python is pre-installed"
204+
205+
- template: etc/ci/azure-container-rpm.yml
206+
parameters:
207+
name: Manylinux2010_64_py37
208+
container: 'quay.io/pypa/manylinux2010_x86_64:latest'
209+
python_path: '/opt/python/cp37-cp37m/bin/python'
210+
install_packages: echo "No extra packages for now"
211+
install_python: echo "Python is pre-installed"
142212

143-
# set -ex
144-
# sudo apt-get -y install software-properties-common
145-
# sudo add-apt-repository -y ppa:deadsnakes
146-
# sudo apt-get -y update
147-
# sudo apt-get install -y python3.6 python3.6-venv python3.6-dev
148-
#
149-
# echo "deb http://ftp.debian.org/debian testing main" | sudo tee -a /etc/apt/sources.list
150-
# echo 'APT::Default-Release "stable";' | sudo tee -a /etc/apt/apt.conf.d/00local
151-
# sudo apt-get -y update
152-
# # 3.6 is no longer in testing
153-
# sudo apt-get install -t testing python3.7 python3.7-dev
154-
#
155-
# - template: etc/ci/azure-container-rpm.yml
156-
# parameters:
157-
# name: CentOS7_py27
158-
# container: 'centos:7'
159-
# python_version: '2.7'
160-
# install_python: sudo yum install -y python python27-devel
161-
#
162-
# - template: etc/ci/azure-container-rpm.yml
163-
# parameters:
164-
# name: CentOS7_py36
165-
# container: 'centos:7'
166-
# python_version: '3.6'
167-
# install_python: |
168-
# set -ex
169-
# sudo yum install -y epel-release
170-
# sudo yum install -y python36 python36-devel python36-virtualenv
171-
#
172-
# - template: etc/ci/azure-container-rpm.yml
173-
# parameters:
174-
# name: Fedora_30_py27
175-
# container: 'fedora:30'
176-
# python_version: '2.7'
177-
# install_python: sudo dnf install -y python python27-devel
178-
#
179-
# - template: etc/ci/azure-container-rpm.yml
180-
# parameters:
181-
# name: Fedora_30_py36
182-
# container: 'fedora:30'
183-
# python_version: '3.6'
184-
# install_python: sudo dnf install -y python36 python36-devel python36-virtualenv
185-
#
186-
# - template: etc/ci/azure-container-manylinux.yml
187-
# parameters:
188-
# name: Manylinux1_64_py27
189-
# container: 'quay.io/pypa/manylinux1_x86_64:latest'
190-
# python_version: '2.7'
191-
#
192-
# - template: etc/ci/azure-container-manylinux.yml
193-
# parameters:
194-
# name: Manylinux1_64_py36
195-
# container: 'quay.io/pypa/manylinux1_x86_64:latest'
196-
# python_version: '3.6'

‎etc/ci/azure-container-deb.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
parameters:
22
name: ''
33
container: ''
4-
python_version: ''
4+
python_path: ''
5+
package_manager: apt-get
56
install_python: ''
67
install_packages: |
7-
set -ex
8+
set -e -x
89
sudo apt-get -y update
910
sudo apt-get -y install \
1011
build-essential \
1112
xz-utils zlib1g bzip2 libbz2-1.0 tar \
1213
sqlite3 libxml2-dev libxslt1-dev \
13-
software-properties-common
14-
package_manager: apt-get
14+
software-properties-common openssl
1515
1616
jobs:
1717
- job: ${{ parameters.name }}
@@ -33,7 +33,7 @@ jobs:
3333
- script: ${{ parameters.install_python }}
3434
displayName: Install Python
3535

36-
- script: PYTHON_EXE=python${{ parameters.python_version }} ./configure
36+
- script: PYTHON_EXE=${{ parameters.python_path }} ./configure
3737
displayName: 'Configure'
3838

3939
- script: bin/py.test -vvs

0 commit comments

Comments
 (0)