Skip to content

Commit 9e45095

Browse files
mohierfmohierf
committed
Update deployment script packages
1 parent 6209609 commit 9e45095

File tree

2 files changed

+66
-27
lines changed

2 files changed

+66
-27
lines changed

‎.travis.yml

+62-24
Original file line numberDiff line numberDiff line change
@@ -38,53 +38,51 @@ notifications:
3838
jobs:
3939
include:
4040
- stage: Coding standard
41-
script: |
42-
# Static code analysis
43-
# -- pycodestyle (former pep8)
44-
pycodestyle --max-line-length=100 --exclude='*.pyc,carboniface.py' alignak/* || travis_terminate 1;
45-
# -- pylint
46-
unset PYTHONWARNINGS
47-
pylint --rcfile=.pylintrc -r no alignak || travis_terminate 1;
48-
export PYTHONWARNINGS=all
49-
# -- pep257
50-
pep257 --select=D300 alignak || travis_terminate 1;
41+
script:
42+
# Static code analysis
43+
# -- pycodestyle (former pep8)
44+
- pycodestyle --max-line-length=100 --exclude='*.pyc,carboniface.py' alignak/*
45+
# -- pylint
46+
# - unset PYTHONWARNINGS
47+
- pylint --rcfile=.pylintrc -r no alignak
48+
# - export PYTHONWARNINGS=all
49+
# -- pep257
50+
- pep257 --select=D300 alignak
5151
- stage: Pypi deployment
5252
script: echo "Deploying to PyPi..."
53+
if: (tag IS present)
5354
deploy:
5455
- provider: pypi
5556
distributions: "sdist bdist_wheel"
5657
skip_existing: true
58+
on:
59+
tags: true
5760
user: alignak
5861
password:
5962
secure: "eoCeoyPlvmE1lHVA+1mi7vDXvabAttW2PE1gyEHBt4KxoiV8rutM+Ka2H6OFjJNNwk2c0XDwdpNXuM94rl8Cg2gsF7SVOcuuaJRzm2f0QIKMld0qXz5h/9H4hiCYYY4A7kmalO0/h63Dha84c7AA/gxdphPg/egMfgU/KnwpSf7Nwhbeiy+Ss2Afs5rOfC1x4A2HScKMe/MpSSnizZC/0WpRI8llZBupwb1sGVD9yclz6rzxs5it6ePgBYYpLxgV0HUPUc9efa3fNVrPme3lrXJqG9xAP152Zoh95jOaLKn6BBwf63CHt2NloKfeqs313T4Z8E7AKMcA2+GUlFlK8mD6vVl4NcVqpCb8noyDUiWb3mH4XGYkvWlWkKhSsqqGR/HkO2YjrRI+4EWt+nUVEva2ydPpKblv0ycg7su06X3nN35+OjacbHyNIBKKC/HAYMJjC/7/maCKgGRHJxoJdCsC43hdhZjjDIlpstndo6NgE9Nl4HJ+rB2sqHJXOUFwMMEvVpcGPPfj8YBVZMR9OG9EJVUsijKpq+/8KIxsyOfXXbmIEEMn7Ct9pSa4oSeo4N6VzPWggpZN9q08uolSBETCUo2mHpyVt2d0RjhcEE9kVDo6Liiv9H0EWnGJg9N2IXBQV3794Ngh1HnJNihcBSqIRC020yQkp1yDZsof34I="
60-
on:
61-
branch: develop
62-
tags: true
6363
- stage: Debian packaging
6464
python: 3.6
6565
install:
6666
# Install packaging requirements
6767
- echo "Installing packaging requirements..."
68-
- sudo apt-get install -y rpm
6968
- sudo pip install virtualenv virtualenv-tools
7069
- sudo pip install --upgrade distribute
7170
script:
7271
- echo "Deploying to BinTray packages..."
7372
# Package Alignak for debian
7473
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION deb
75-
# Not yet available
76-
# ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION freebsd;
74+
# if: (branch IN (master, develop)) OR (tag IS present)
7775
deploy:
7876
- provider: bintray
7977
skip_cleanup: true
80-
file: .bintray-deb.json
78+
file: dist/.bintray-deb.json
79+
on:
80+
all_branches: true
81+
# condition: $TRAVIS_BRANCH =~ ^master|develop$
8182
user: mohierf
8283
key:
8384
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="
84-
on:
85-
branch: develop
86-
tags: true
87-
- stage: RPM packaging for Python 2
85+
- stage: RPM packaging (Python 2)
8886
python: 2.7
8987
install:
9088
# Install packaging requirements
@@ -96,13 +94,53 @@ jobs:
9694
- echo "Deploying to BinTray packages..."
9795
# Package Alignak for rpm
9896
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION rpm
97+
# if: (branch IN (master, develop)) OR (tag IS present)
9998
deploy:
10099
- provider: bintray
101100
skip_cleanup: true
102-
file: .bintray-deb.json
101+
file: dist/.bintray-rpm.json
103102
user: mohierf
104103
key:
105104
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="
105+
- stage: RPM packaging (Python 3)
106+
python: 3.6
107+
install:
108+
# Install packaging requirements
109+
- echo "Installing packaging requirements..."
110+
- sudo apt-get install -y rpm
111+
- sudo pip install virtualenv virtualenv-tools
112+
- sudo pip install --upgrade distribute
113+
script:
114+
- echo "Deploying to BinTray packages..."
115+
# Package Alignak for rpm
116+
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION rpm
117+
# if: (branch IN (master, develop)) OR (tag IS present)
118+
deploy:
119+
- provider: bintray
120+
skip_cleanup: true
121+
file: dist/.bintray-rpm.json
122+
user: mohierf
123+
key:
124+
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="
125+
- stage: FreeBSD packaging for Python 3
126+
python: 3.6
127+
install:
128+
# Install packaging requirements
129+
- echo "Installing packaging requirements..."
130+
- sudo pip install virtualenv virtualenv-tools
131+
- sudo pip install --upgrade distribute
132+
script:
133+
- echo "Deploying to BinTray packages..."
134+
# Package Alignak-backend for deb/rpm
135+
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION freebsd
136+
# if: (branch IN (master, develop)) OR (tag IS present)
137+
deploy:
138+
- provider: bintray
139+
skip_cleanup: true
140+
file: dist/.bintray-freebsd.json
106141
on:
107-
branch: develop
108-
tags: true
142+
all_branches: true
143+
# tags: true
144+
user: mohierf
145+
key:
146+
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="

‎package.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ elif [ "${output_type}" = "rpm" ]; then
184184
--architecture all \
185185
--license AGPL \
186186
--version ${version} \
187-
--name "${pkg_name}" \
187+
--name "${python_prefix}-${pkg_name}" \
188188
--description "${pkg_description}" \
189189
--url "${pkg_url}" \
190190
--vendor "${pkg_team}" \
@@ -205,7 +205,7 @@ else
205205
--force \
206206
--input-type ${input_type} \
207207
--output-type ${output_type} \
208-
--package "./bin" \
208+
--package "./dist" \
209209
--architecture all \
210210
--license AGPL \
211211
--version ${version} \
@@ -214,10 +214,11 @@ else
214214
--url "${pkg_url}" \
215215
--vendor "${pkg_team}" \
216216
--maintainer "${pkg_team}" \
217-
--python-bin '/usr/bin/python' \
217+
--python-bin 'python' \
218218
--python-pip 'pip' \
219219
--python-install-data '/usr/local' \
220220
--python-install-bin '/usr/local/bin' \
221221
--no-python-dependencies \
222+
--after-install './bin/post-install.sh' \
222223
./setup.py
223224
fi

0 commit comments

Comments
 (0)