Repository: couchdb-ci Updated Branches: refs/heads/master 67d84506e -> f65d4a216
More packaging support & bugfixes Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/f65d4a21 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/f65d4a21 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/f65d4a21 Branch: refs/heads/master Commit: f65d4a21696b1a58a80b451e50d150973d7e2d77 Parents: 67d8450 Author: Joan Touzet <[email protected]> Authored: Sun May 7 12:36:39 2017 -0700 Committer: Joan Touzet <[email protected]> Committed: Sun May 7 12:36:39 2017 -0700 ---------------------------------------------------------------------- ansible/roles/common/files/build.sudoers | 1 + ansible/roles/common/tasks/main.yml | 9 +++++++ .../roles/dependencies-centos/tasks/main.yml | 17 ++++++++++++ .../roles/dependencies-debian/tasks/main.yml | 1 + ansible/roles/lintian-debian/tasks/main.yml | 12 ++++----- ansible/roles/lintian-ubuntu/files/main.profile | 3 +++ ansible/roles/lintian-ubuntu/meta/main.yml | 3 +++ ansible/roles/lintian-ubuntu/tasks/main.yml | 28 ++++++++++++++++++++ ansible/ubuntu-12.04-base.yml | 1 + ansible/ubuntu-14.04-base.yml | 1 + ansible/ubuntu-16.04-base.yml | 1 + 11 files changed, 71 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/f65d4a21/ansible/roles/common/files/build.sudoers ---------------------------------------------------------------------- diff --git a/ansible/roles/common/files/build.sudoers b/ansible/roles/common/files/build.sudoers new file mode 100644 index 0000000..89a4eb3 --- /dev/null +++ b/ansible/roles/common/files/build.sudoers @@ -0,0 +1 @@ +build ALL=(ALL) NOPASSWD: ALL http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/f65d4a21/ansible/roles/common/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index a8ba3e3..56ac10a 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -16,3 +16,12 @@ # under the License. - include: couchdb.yml + +- name: copy build sudoers file + copy: + src: build.sudoers + dest: /etc/sudoers.d/build + owner: root + group: root + mode: 0440 + http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/f65d4a21/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 d9367a1..75f280f 100644 --- a/ansible/roles/dependencies-centos/tasks/main.yml +++ b/ansible/roles/dependencies-centos/tasks/main.yml @@ -20,6 +20,7 @@ with_items: - "@Development tools" - git + - sudo - wget - which @@ -94,5 +95,21 @@ - name: install up to date version of sphinx via pip shell: pip install sphinx==1.5.3 +- name: dependencies for packages + yum: name={{item}} state=present + with_items: + - createrepo + - xfsprogs-devel + - rpmdevtools + +- name: dependencies for JS packages (CentOS 6 only) + when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '6' + yum: name={{item}} state=present + with_items: + - ncurses-devel + - autoconf213 + - nspr-devel + - readline-devel + - name: clean up yum cache command: yum clean all http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/f65d4a21/ansible/roles/dependencies-debian/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/dependencies-debian/tasks/main.yml b/ansible/roles/dependencies-debian/tasks/main.yml index aef6cbd..e0df565 100644 --- a/ansible/roles/dependencies-debian/tasks/main.yml +++ b/ansible/roles/dependencies-debian/tasks/main.yml @@ -29,6 +29,7 @@ - pkg-config - python - python-pip + - sudo # dependencies for make couch, except erlang - name: install packages required to build CouchDB http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/f65d4a21/ansible/roles/lintian-debian/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/lintian-debian/tasks/main.yml b/ansible/roles/lintian-debian/tasks/main.yml index 1686a46..07da606 100644 --- a/ansible/roles/lintian-debian/tasks/main.yml +++ b/ansible/roles/lintian-debian/tasks/main.yml @@ -12,17 +12,17 @@ - name: make lintian vendor directory file: - path: /home/build/.lintian/profiles/couchdb + path: /usr/share/lintian/profiles/couchdb state: directory - owner: build - group: build + owner: root + group: root mode: 0755 recurse: yes - name: copy lintian vendor profile copy: src: main.profile - dest: /home/build/.lintian/profiles/couchdb/main.profile - owner: build - group: build + dest: /usr/share/lintian/profiles/couchdb/main.profile + owner: root + group: root mode: 0644 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/f65d4a21/ansible/roles/lintian-ubuntu/files/main.profile ---------------------------------------------------------------------- diff --git a/ansible/roles/lintian-ubuntu/files/main.profile b/ansible/roles/lintian-ubuntu/files/main.profile new file mode 100644 index 0000000..b4520cb --- /dev/null +++ b/ansible/roles/lintian-ubuntu/files/main.profile @@ -0,0 +1,3 @@ +Profile: couchdb/main +Extends: ubuntu/main +Disable-Tags: dir-or-file-in-opt, source-is-missing, non-etc-file-marked-as-conffile http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/f65d4a21/ansible/roles/lintian-ubuntu/meta/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/lintian-ubuntu/meta/main.yml b/ansible/roles/lintian-ubuntu/meta/main.yml new file mode 100644 index 0000000..6b4fff8 --- /dev/null +++ b/ansible/roles/lintian-ubuntu/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - { role: common } http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/f65d4a21/ansible/roles/lintian-ubuntu/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/lintian-ubuntu/tasks/main.yml b/ansible/roles/lintian-ubuntu/tasks/main.yml new file mode 100644 index 0000000..07da606 --- /dev/null +++ b/ansible/roles/lintian-ubuntu/tasks/main.yml @@ -0,0 +1,28 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. + +- name: make lintian vendor directory + file: + path: /usr/share/lintian/profiles/couchdb + state: directory + owner: root + group: root + mode: 0755 + recurse: yes + +- name: copy lintian vendor profile + copy: + src: main.profile + dest: /usr/share/lintian/profiles/couchdb/main.profile + owner: root + group: root + mode: 0644 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/f65d4a21/ansible/ubuntu-12.04-base.yml ---------------------------------------------------------------------- diff --git a/ansible/ubuntu-12.04-base.yml b/ansible/ubuntu-12.04-base.yml index 8dda83d..f3a8615 100644 --- a/ansible/ubuntu-12.04-base.yml +++ b/ansible/ubuntu-12.04-base.yml @@ -21,4 +21,5 @@ - ubuntu-1204 - { role: nodesource.node, nodejs_version: '6.x' } - dependencies-debian + - lintian-ubuntu - common http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/f65d4a21/ansible/ubuntu-14.04-base.yml ---------------------------------------------------------------------- diff --git a/ansible/ubuntu-14.04-base.yml b/ansible/ubuntu-14.04-base.yml index e89838a..b2a0f48 100644 --- a/ansible/ubuntu-14.04-base.yml +++ b/ansible/ubuntu-14.04-base.yml @@ -21,4 +21,5 @@ - ubuntu-1404 - { role: nodesource.node, nodejs_version: '6.x' } - dependencies-debian + - lintian-ubuntu - common http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/f65d4a21/ansible/ubuntu-16.04-base.yml ---------------------------------------------------------------------- diff --git a/ansible/ubuntu-16.04-base.yml b/ansible/ubuntu-16.04-base.yml index 27f9fdb..c0406de 100644 --- a/ansible/ubuntu-16.04-base.yml +++ b/ansible/ubuntu-16.04-base.yml @@ -21,4 +21,5 @@ - ubuntu-1604 - { role: nodesource.node, nodejs_version: '6.x' } - dependencies-debian + - lintian-ubuntu - common
