Skip to content

Commit 78682e3

Browse files
mohierfmohierf
committed
Complies new Alignak directory structure
Updates packaging and python 3 Update tests for python3
1 parent 305e4bc commit 78682e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+4497
-1804
lines changed

‎.bintray-deb.json

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"package": {
3+
"name": "sed_package_name",
4+
"repo": "sed_version_repo",
5+
"subject": "alignak",
6+
"desc": "Alignak Web Services modules",
7+
"vcs_url": "https://github.com/Alignak-monitoring-contrib/alignak-module-ws.git",
8+
"website_url": "http://alignak.net",
9+
"issue_tracker_url": "https://github.com/Alignak-monitoring-contrib/alignak-module-ws/issues",
10+
"labels": ["alignak", "web-services", "ws", "modules"],
11+
"licenses": ["AGPL-V3"]
12+
},
13+
"version": {
14+
"name": "sed_version_name",
15+
"desc": "sed_version_desc",
16+
"released": "sed_version_released"
17+
},
18+
"files": [
19+
{
20+
"includePattern": "./dist/(.*\\.deb)",
21+
"uploadPattern": "$1",
22+
"matrixParams": {
23+
"override": "1",
24+
"deb_distribution": "jessie,Stretch,Trusty,xenial,Yakkety,Zesty,Artful",
25+
"deb_component": "main",
26+
"deb_architecture": "all"
27+
}
28+
}
29+
],
30+
"publish": true
31+
}

‎.bintray-freebsd.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"package": {
3+
"name": "sed_package_name",
4+
"repo": "sed_version_repo",
5+
"subject": "alignak",
6+
"desc": "Alignak Web Services modules",
7+
"vcs_url": "https://github.com/Alignak-monitoring-contrib/alignak-module-ws.git",
8+
"website_url": "http://alignak.net",
9+
"issue_tracker_url": "https://github.com/Alignak-monitoring-contrib/alignak-module-ws/issues",
10+
"labels": ["alignak", "web-services", "ws", "modules"],
11+
"licenses": ["AGPL-V3"]
12+
},
13+
"version": {
14+
"name": "sed_version_name",
15+
"desc": "sed_version_desc",
16+
"released": "sed_version_released"
17+
},
18+
"files": [
19+
{
20+
"includePattern": "./dist/(.*\\.txz)",
21+
"uploadPattern": "$1",
22+
"matrixParams": {
23+
"override": 1
24+
}
25+
}
26+
],
27+
"publish": true
28+
}

‎.bintray-rpm.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"package": {
3+
"name": "sed_package_name",
4+
"repo": "sed_version_repo",
5+
"subject": "alignak",
6+
"desc": "Alignak Web Services modules",
7+
"vcs_url": "https://github.com/Alignak-monitoring-contrib/alignak-module-ws.git",
8+
"website_url": "http://alignak.net",
9+
"issue_tracker_url": "https://github.com/Alignak-monitoring-contrib/alignak-module-ws/issues",
10+
"labels": ["alignak", "web-services", "ws", "modules"],
11+
"licenses": ["AGPL-V3"]
12+
},
13+
"version": {
14+
"name": "sed_version_name",
15+
"desc": "sed_version_desc",
16+
"released": "sed_version_released"
17+
},
18+
"files": [
19+
{
20+
"includePattern": "./dist/(.*\\.rpm)",
21+
"uploadPattern": "$1",
22+
"matrixParams": {
23+
"override": 1
24+
}
25+
}
26+
],
27+
"publish": true
28+
}

‎.bintray.json

-25
This file was deleted.

‎.travis.yml

+100-38
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,116 @@ language: python
22
sudo: true
33
python:
44
- "2.7"
5-
# - "3.4"
5+
- "3.4"
6+
- "3.5"
7+
- "3.6"
68

79
services:
810
- mongodb
911

10-
# command to install dependencies
11-
# some are only used for travis/coveralls so we are installing them here only
12+
before_install:
13+
- export TZ=UTC
14+
1215
install:
16+
# Install all Python requirements (application and tests)
1317
- ./test/setup_test.sh
18+
# To help eventual debug: knowing which exact versions are in use can be rather useful.
19+
- pip freeze
1420

15-
# command to run tests
1621
script:
17-
# so to help eventual debug: knowing what exact versions are in use can be rather useful.
18-
- pip freeze
19-
# Code static analysis
20-
- pycodestyle --max-line-length=100 --exclude='*.pyc, *.cfg, *.log' --ignore='E402' alignak_module_ws/*
21-
- pylint --rcfile=.pylintrc alignak_module_ws/
22-
# Code dynamic analysis
22+
# Code dynamic analysis and tests
2323
- cd test
24-
24+
# Delete previously existing coverage results
2525
# Run test suite with py.test running its coverage plugin
26-
- pytest -v --no-print-logs --cov=alignak_module_ws --cov-config .coveragerc test_*.py
27-
26+
- pytest --verbose --durations=10 --no-print-logs --cov=alignak_module_ws --cov-config .coveragerc test_*.py
27+
# Report about coverage - Upload coverage results to codecov
28+
- bash <(curl -s https://codecov.io/bash)
2829
- cd ..
29-
# specific call to launch coverage data into coveralls.io
3030
after_success:
31-
# to get coverage data with relative paths and not absolute we have to
32-
# execute coveralls from the base directory of the project,
33-
# so we need to move the .coverage file here :
34-
- mv test/.coverage . && coveralls --rcfile=test/.coveragerc
35-
# mv test/.coverage . && coveralls -v
36-
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION $TRAVIS_TAG
37-
38-
deploy:
39-
- provider: bintray
40-
skip_cleanup: true
41-
file: .bintray.json
42-
user: ddurieux
43-
key:
44-
secure: "3uEOyxJIC5Gyd2f/+8mBAMABngwg5mM3oZYF6SUbws9UbQpAE0Gj0h1O7szUnhdMaVdnBj4CsHoROnGFMMATSRHB6dsTYdNadDrOkO795BzsZY7n1NFRQ7RmlCRxFx30xlANJ3xt2jzm9F1ZlCXTIOv3WuymYD3VaNmNsARnUfiAHSkmDHjcAi8kXz0UVP99FKeM0cyhZNkr7K6TMHGFEmj5KYlwvnmEQmYawv7UkudWUnrxcvyo5xP/CBsLF7Bela1kCOeEcqB2NP1SMLpdOjDKvc6ftEvvM30Th7gq36OrBIF7/EiAa8RIZ0v4J/Q61N4T1JZ7wpZrS9V4MihoLYwtdXs2gA4oIIvEY6hqSXiJA/U4DWWqfWDWdkrF9HaEhISJ44U/pF+WzRaEU9uR5KKUqfyNS1G37bOHHBfJIMpf/CREEAs0TFTIIPXvd2G+0AP2rm3KuisYFFsEbp2bpzXDehVkysrk6JX01M9FBO6LnTViCXvmTOAuugTAWr3QBvm22ZlTYgWRgdMyvOdJfqeYualbkOR/T3vNSi/J1C7P/RhOkWe9hCGpIjR2S5WHfTe2hRkH7+DT7Brr54qHCv8g4Jgem5TvUvb7FA/4yJ7KUk+dZRbOIUWNkhzH/mFmb1wkfPHLHkVJ8g/uYtwW1SESWbSvlF7j8kAhRFfOTi8="
45-
on:
46-
branch: develop
47-
- provider: bintray
48-
skip_cleanup: true
49-
file: .bintray.json
50-
user: ddurieux
51-
key:
52-
secure: "3uEOyxJIC5Gyd2f/+8mBAMABngwg5mM3oZYF6SUbws9UbQpAE0Gj0h1O7szUnhdMaVdnBj4CsHoROnGFMMATSRHB6dsTYdNadDrOkO795BzsZY7n1NFRQ7RmlCRxFx30xlANJ3xt2jzm9F1ZlCXTIOv3WuymYD3VaNmNsARnUfiAHSkmDHjcAi8kXz0UVP99FKeM0cyhZNkr7K6TMHGFEmj5KYlwvnmEQmYawv7UkudWUnrxcvyo5xP/CBsLF7Bela1kCOeEcqB2NP1SMLpdOjDKvc6ftEvvM30Th7gq36OrBIF7/EiAa8RIZ0v4J/Q61N4T1JZ7wpZrS9V4MihoLYwtdXs2gA4oIIvEY6hqSXiJA/U4DWWqfWDWdkrF9HaEhISJ44U/pF+WzRaEU9uR5KKUqfyNS1G37bOHHBfJIMpf/CREEAs0TFTIIPXvd2G+0AP2rm3KuisYFFsEbp2bpzXDehVkysrk6JX01M9FBO6LnTViCXvmTOAuugTAWr3QBvm22ZlTYgWRgdMyvOdJfqeYualbkOR/T3vNSi/J1C7P/RhOkWe9hCGpIjR2S5WHfTe2hRkH7+DT7Brr54qHCv8g4Jgem5TvUvb7FA/4yJ7KUk+dZRbOIUWNkhzH/mFmb1wkfPHLHkVJ8g/uYtwW1SESWbSvlF7j8kAhRFfOTi8="
53-
on:
54-
tags: true
5531

32+
jobs:
33+
include:
34+
- stage: Coding standard
35+
python: 3.6
36+
script:
37+
# Static code analysis
38+
# -- pycodestyle (former pep8)
39+
- pycodestyle --max-line-length=100 --exclude='*.pyc, *.cfg, *.log' --ignore='E402' --ignore='W504' alignak_module_ws/*
40+
# -- pylint
41+
- pylint --rcfile=.pylintrc -r no alignak_module_ws
42+
# -- pep257
43+
- pep257 --select=D300 alignak_module_ws
44+
- stage: Pypi deployment
45+
python: 3.6
46+
script: echo "Deploying to PyPi..."
47+
if: (tag IS present)
48+
deploy:
49+
- provider: pypi
50+
distributions: "sdist bdist_wheel"
51+
skip_existing: true
52+
on:
53+
tags: true
54+
user: alignak
55+
password:
56+
secure: "RpL6CArq0yC734lzOh3ERq5p67274RayoiqLvEb5r5Sas+Zv0lcrEHNLT8v1fwIs0aJBZEE8NnXyTwD3bK03MGoRYGb00viVV/8x3ASYhvZ6MW41LcnLIDJRL2ZqhCU9LWcgkbGDxYoiuObedMvtwtj/iADjkQ9T7R/X9waWCLgfxOZtXDE3xnEBYXrntvGPYd/KQkrQQ1pg5SC74sdIsnHcsN5j7Dt/HlSNDv0CZaZ8zptg7dIlbn472+2TTesiyIFcEoFviGw6UmElkUTwkxyH0ix8mX1unibwaROHM/YJoz06GmAgPzjXmdAFvccWqCtp8uYMVitJSt8/JUIhsXntJM2yIhzCE/SRT7HIU0Z7IiQwjaY6bhGha8o0DmSIYdc+3cARtna5/alGGv5xQxF2TTZGEZJeOKsQsXfh9G8SpLjdl+2eznMgAO5G0SOxBs57ovSMrFmhpA3qjz8kVLgroNvEOE9gd2+9NjXm5p7ioxlXpixwWhSEkMDLP8jH7RzvnFMw+iAjeYJMYpjGAyzViDE09tsgwWlsu3aw69LBRDVS9/3b8Cb0FG7/uxffTtYc79KLI2XPt2eQRi1SihnR8mpXHqE4A5fAVn6sUmsyUMFriJipsUwaAEBNgXioGR99iDgkoEHaxFSl5cW0R/JOCoKr1Q/Bs3NjH3WBcTw="
57+
- stage: Debian packaging
58+
python: 2.7
59+
install:
60+
# Install packaging requirements
61+
- echo "Installing packaging requirements..."
62+
script:
63+
- echo "Deploying to BinTray packages..."
64+
# Package Alignak module for deb/rpm
65+
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION deb
66+
# if: (branch IN (master, develop)) OR (tag IS present)
67+
deploy:
68+
- provider: bintray
69+
skip_cleanup: true
70+
file: dist/.bintray-deb.json
71+
on:
72+
all_branches: true
73+
# condition: $TRAVIS_BRANCH =~ ^master|develop$
74+
user: mohierf
75+
key:
76+
secure: "erz6dVnW0973dGDdclMZvmQWOlo2yjYkmuxQFY3j5srEMgwVIDoXaycuNHAfNOJC73a0bZSlTPF9c8rx7Sk5SJDlcWNqRstjwEpOhn6AHMbxdu5trX1VtnDPR2XUJohbri7YudDu4BGXa86EnQ4sBBtKgjVPLXtHvkUoDfikTDTmff7N+DPEsDda2DPAEs74IGMXE0GjFMJL0uNgfBADwYaEE7fLJ3xJVAhny04u2Ve0qJ8mX2ajVv+BXIgcUOrAhPxzJUtTYlVMOjYQ91BmhLUqv2KB23FR5Q6GZslgVHeMZ0Evi350GGZR7KDz/5ka1iLab7yS9MpLja7V0B8DVD1/b0suMG6pBLzkyXwAJKM6/pxYn5BoAf6MKOeman7Dan3Nt9EsxGUf+b81H0aP/vEYWTbLCglRF3N7PebZzOxO8Pje8RTRvQMrKgFzidLSKU1KMZOUpgbFWuiXlkqf/iVy1cP5x5JLJAlkZdQQRF+ibdIiKkilcJ4EgzY2hQq2BoCMd874iaRK4dv9Vthw6MhUBB/73vmpmAR6rQzWUi223bd17a8qxu9rvWJRMl/2cyXRXFS9BP65q6Xs2unEkbMV+ZAh37PTJrNgSj5J0oDI2LhFk8dliYZPBC2P5aeGX2jgi+kt+DI9QRGBFK/Zr6SB81Eh6GvaePNkMdcyLQY="
77+
- stage: RPM packaging
78+
python: 2.7
79+
install:
80+
# Install packaging requirements
81+
- echo "Installing packaging requirements..."
82+
- sudo apt-get install -y rpm
83+
script:
84+
- echo "Deploying to BinTray packages..."
85+
# Package Alignak module for deb/rpm
86+
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION rpm
87+
# if: (branch IN (master, develop)) OR (tag IS present)
88+
deploy:
89+
- provider: bintray
90+
skip_cleanup: true
91+
file: dist/.bintray-rpm.json
92+
on:
93+
all_branches: true
94+
# tags: true
95+
user: mohierf
96+
key:
97+
secure: "erz6dVnW0973dGDdclMZvmQWOlo2yjYkmuxQFY3j5srEMgwVIDoXaycuNHAfNOJC73a0bZSlTPF9c8rx7Sk5SJDlcWNqRstjwEpOhn6AHMbxdu5trX1VtnDPR2XUJohbri7YudDu4BGXa86EnQ4sBBtKgjVPLXtHvkUoDfikTDTmff7N+DPEsDda2DPAEs74IGMXE0GjFMJL0uNgfBADwYaEE7fLJ3xJVAhny04u2Ve0qJ8mX2ajVv+BXIgcUOrAhPxzJUtTYlVMOjYQ91BmhLUqv2KB23FR5Q6GZslgVHeMZ0Evi350GGZR7KDz/5ka1iLab7yS9MpLja7V0B8DVD1/b0suMG6pBLzkyXwAJKM6/pxYn5BoAf6MKOeman7Dan3Nt9EsxGUf+b81H0aP/vEYWTbLCglRF3N7PebZzOxO8Pje8RTRvQMrKgFzidLSKU1KMZOUpgbFWuiXlkqf/iVy1cP5x5JLJAlkZdQQRF+ibdIiKkilcJ4EgzY2hQq2BoCMd874iaRK4dv9Vthw6MhUBB/73vmpmAR6rQzWUi223bd17a8qxu9rvWJRMl/2cyXRXFS9BP65q6Xs2unEkbMV+ZAh37PTJrNgSj5J0oDI2LhFk8dliYZPBC2P5aeGX2jgi+kt+DI9QRGBFK/Zr6SB81Eh6GvaePNkMdcyLQY="
98+
- stage: FreeBSD packaging for Python 3
99+
python: 3.6
100+
install:
101+
# Install packaging requirements
102+
- echo "Installing packaging requirements..."
103+
script:
104+
- echo "Deploying to BinTray packages..."
105+
# Package Alignak module for deb/rpm
106+
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION freebsd
107+
# if: (branch IN (master, develop)) OR (tag IS present)
108+
deploy:
109+
- provider: bintray
110+
skip_cleanup: true
111+
file: dist/.bintray-freebsd.json
112+
on:
113+
all_branches: true
114+
# tags: true
115+
user: mohierf
116+
key:
117+
secure: "erz6dVnW0973dGDdclMZvmQWOlo2yjYkmuxQFY3j5srEMgwVIDoXaycuNHAfNOJC73a0bZSlTPF9c8rx7Sk5SJDlcWNqRstjwEpOhn6AHMbxdu5trX1VtnDPR2XUJohbri7YudDu4BGXa86EnQ4sBBtKgjVPLXtHvkUoDfikTDTmff7N+DPEsDda2DPAEs74IGMXE0GjFMJL0uNgfBADwYaEE7fLJ3xJVAhny04u2Ve0qJ8mX2ajVv+BXIgcUOrAhPxzJUtTYlVMOjYQ91BmhLUqv2KB23FR5Q6GZslgVHeMZ0Evi350GGZR7KDz/5ka1iLab7yS9MpLja7V0B8DVD1/b0suMG6pBLzkyXwAJKM6/pxYn5BoAf6MKOeman7Dan3Nt9EsxGUf+b81H0aP/vEYWTbLCglRF3N7PebZzOxO8Pje8RTRvQMrKgFzidLSKU1KMZOUpgbFWuiXlkqf/iVy1cP5x5JLJAlkZdQQRF+ibdIiKkilcJ4EgzY2hQq2BoCMd874iaRK4dv9Vthw6MhUBB/73vmpmAR6rQzWUi223bd17a8qxu9rvWJRMl/2cyXRXFS9BP65q6Xs2unEkbMV+ZAh37PTJrNgSj5J0oDI2LhFk8dliYZPBC2P5aeGX2jgi+kt+DI9QRGBFK/Zr6SB81Eh6GvaePNkMdcyLQY="

‎alignak_module_ws/etc/alignak.d/alignak.module-ws.ini ‎alignak_module_ws/etc/alignak.d/alignak-module-ws.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ python_name=alignak_module_ws
120120
# Send log check result to the backend for old received metrics (defaults to yes)
121121
# deprecated - timeshift is the delay to consider that a received livestate is in the past
122122
# if the received livestate is older than alignak_backend_timeshift seconds, no external
123-
# command will be sent to the scheduler and the check result will not be sent to the backend
123+
# command will be sent to the scheduler and the check result will not be sent to the backend
124124
# if alignak_backend_get_lcr is 1 then the older log check result will be fetched from the
125125
# backend to update the posted log check result
126126
;alignak_backend_old_lcr=1

0 commit comments

Comments
 (0)