Skip to content

Commit

Permalink
Update Travis config for the removal of pulpcore-plugin
Browse files Browse the repository at this point in the history
Required PR: pulp/pulpcore#347

re: #5580
ihttps://pulp.plan.io/issues/5580
  • Loading branch information
dralley authored and mikedep333 committed Nov 8, 2019
1 parent 07f8581 commit f7f5b0b
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 23 deletions.
1 change: 0 additions & 1 deletion example-source/group_vars/all
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
pulp_default_admin_password: password
pulp_source_dir: '/var/lib/pulp/devel/pulpcore'
pulp_plugin_source_dir: "/var/lib/pulp/devel/pulpcore-plugin"
pulp_install_plugins:
pulp-file:
source_dir: "/var/lib/pulp/devel/pulp_file"
Expand Down
6 changes: 0 additions & 6 deletions molecule/source/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
dest: '{{ pulp_source_dir }}'
update: yes

- name: Clone pulpcore-plugin repository
git:
repo: 'https://github.com/pulp/pulpcore-plugin.git'
dest: '{{ pulp_plugin_source_dir }}'
update: yes

- name: Clone pulp_file repository
git:
repo: 'https://github.com/pulp/pulp_file.git'
Expand Down
3 changes: 0 additions & 3 deletions roles/pulp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ Role Variables:
* `pulp_source_dir`: Optional. Absolute path to pulpcore source code. If
present, pulpcore will be installed from source in editable mode. Also accepts
a pip VCS URL, to (for example) install the master branch.
* `pulp_plugin_source_dir`: Optional. Absolute path to pulpcore-plugin source
code. If present, pulpcore-plugin will be installed from source in editable
mode. Also accepts a pip VCS URL, to (for example) install the master branch.
* `pulp_user`: User that owns and runs Pulp. Defaults to "pulp".
* `pulp_user_id`: Integer value of uid for the `pulp_user`. Defaults to nothing and uid is assigned
by the system.
Expand Down
13 changes: 0 additions & 13 deletions roles/pulp/tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,19 +177,6 @@
changed_when: result.changed and not pulp_pip_editable
notify: Collect static content

- name: Install pulpcore-plugin package from source
pip:
name: '{{ pulp_plugin_source_dir }}'
editable: '{{ pulp_pip_editable }}'
state: present
virtualenv: '{{ pulp_install_dir }}'
virtualenv_command: '{{ pulp_python_interpreter }} -m venv'
when: pulp_plugin_source_dir is defined
# This is a hack. Editable pip installs are always changed, which fails molecule's
# idempotence test.
changed_when: result.changed and not pulp_pip_editable
notify: Collect static content

- name: Install Pulp plugins via PyPI
pip:
name: '{{ item.key }}'
Expand Down

0 comments on commit f7f5b0b

Please sign in to comment.