Skip to content

Commit

Permalink
Merge branch 'master' of github.com:performancecopilot/pcp
Browse files Browse the repository at this point in the history
  • Loading branch information
natoscott committed May 16, 2019
2 parents 6f9dd2e + 22de03a commit bb70501
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
20 changes: 1 addition & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ env:

sudo: required

services:
- docker

language: c

addons:
Expand All @@ -24,21 +21,6 @@ addons:
before_install:
- echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
- sudo apt-get -qq update
- sudo apt-get install -y linux-headers-$(uname -r)
- docker build -f build/containers/travis-ci/Dockerfile -t pcp-qa .

before_script:
- docker run -d --privileged -v /lib/modules:/lib/modules:ro -v /usr/src:/usr/src:ro --name pcp-qa pcp-qa
- docker exec pcp-qa bash -c 'touch /var/lib/pcp/pmdas/simple/.NeedInstall'
- docker exec pcp-qa bash -c 'touch /var/lib/pcp/pmdas/sample/.NeedInstall'
- docker exec pcp-qa bash -c 'systemctl restart pmcd || journalctl -xe'

script:
- docker exec pcp-qa bash -c 'cd /var/lib/pcp/testsuite && ./check -g sanity'
- docker exec pcp-qa bash -c 'cd /var/lib/pcp/testsuite && ./check -g pmda.bcc'

after_failure:
- docker exec pcp-qa bash -c 'tail -vn +1 $(for bad in /var/lib/pcp/testsuite/*.out.bad; do echo $bad ${bad/out.bad/full}; done)'

after_script:
- docker exec pcp-qa bash -c 'tail -vn +1 $(find /var/log/pcp -name "*.log")'
- /bin/true
2 changes: 1 addition & 1 deletion qa/1173
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ echo "QA output created by $seq"
. ./common.bcc

_pmdabcc_check
_pmdabcc_require_kernel_version 4 7
_pmdabcc_require_kernel_version 4 18
_python_probe_check

status=1 # failure is the default!
Expand Down

0 comments on commit bb70501

Please sign in to comment.