Repository: couchdb-ci Updated Branches: refs/heads/master fab1898af -> 4bac58661
Revert Ansible deprecation fix for CentOS Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/4bac5866 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/4bac5866 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/4bac5866 Branch: refs/heads/master Commit: 4bac58661de20d5a260cbdad93ada0607ff59906 Parents: fab1898 Author: Joan Touzet <woh...@apache.org> Authored: Fri Oct 13 22:43:38 2017 -0700 Committer: Joan Touzet <woh...@apache.org> Committed: Fri Oct 13 22:43:38 2017 -0700 ---------------------------------------------------------------------- .travis.yml | 7 ++----- ansible/roles/dependencies-centos/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/4bac5866/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 9b8fd49..b83f141 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,6 @@ before_script: - docker --version script: - - find bin/${OS}-base -type d -exec {}/create-container.sh \; - - find bin/${OS}-erlang* -type d -exec {}/create-container.sh \; - -after_script: - - bin/cleanup-docker.sh + - find bin/${OS}-base -type d | xargs -I abc abc/create-container.sh + - find bin/${OS}-erlang* -type d | xargs -I abc abc/create-container.sh http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/4bac5866/ansible/roles/dependencies-centos/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/dependencies-centos/tasks/main.yml b/ansible/roles/dependencies-centos/tasks/main.yml index beabd1e..6dd8e81 100644 --- a/ansible/roles/dependencies-centos/tasks/main.yml +++ b/ansible/roles/dependencies-centos/tasks/main.yml @@ -62,7 +62,7 @@ state: present # download and install shunit2 -- import_tasks: shunit.yml +- include: shunit.yml # required for make docs - name: install packages required to build CouchDB docs
