From bac53a2c1d2fdb32a72fafeea8c53c0c4022152f Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 9 Aug 2017 23:41:48 +0200 Subject: [PATCH] ci-workers: Variable overrides and process tweaks for CentOS 7 Part of #2510 --- contrib/ci-workers/tasks/install-pip.yml | 8 ++++++++ contrib/ci-workers/unix.yml | 4 ++++ contrib/ci-workers/vars/CentOS.yml | 13 +++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 contrib/ci-workers/tasks/install-pip.yml create mode 100644 contrib/ci-workers/vars/CentOS.yml diff --git a/contrib/ci-workers/tasks/install-pip.yml b/contrib/ci-workers/tasks/install-pip.yml new file mode 100644 index 000000000..8beff50ef --- /dev/null +++ b/contrib/ci-workers/tasks/install-pip.yml @@ -0,0 +1,8 @@ +--- +- name: Fetch pip installer + get_url: + url: https://bootstrap.pypa.io/get-pip.py + dest: /tmp/get-pip.py + +- name: Install pip + command: "{{ ansible_python.executable }} /tmp/get-pip.py" diff --git a/contrib/ci-workers/unix.yml b/contrib/ci-workers/unix.yml index ac53ae412..6e6cc49c4 100644 --- a/contrib/ci-workers/unix.yml +++ b/contrib/ci-workers/unix.yml @@ -84,6 +84,10 @@ state: present with_items: "{{ package_deps }}" + - name: Install pip [CentOS] + include: tasks/install-pip.yml + when: ansible_distribution == 'CentOS' + - name: Install required Python modules pip: name: "{{ item }}" diff --git a/contrib/ci-workers/vars/CentOS.yml b/contrib/ci-workers/vars/CentOS.yml new file mode 100644 index 000000000..7e09b0717 --- /dev/null +++ b/contrib/ci-workers/vars/CentOS.yml @@ -0,0 +1,13 @@ +--- +buildbot_deps: [] # Empty to remove python-pip +build_deps: + - bzip2 + - gcc + - gcc-c++ + - make + - patch +dist_deps: + - pkgconfig # Required until b556beda264308e040f8d88aca4f2f386a0183d9 is pulled in + - python-devel + - redhat-rpm-config +pip_bin_dir: /usr/bin