Fix Travis tests and test new features

.travis.yml

@@ -3,29 +3,18 @@ language: python
 python: "2.7"
 sudo: required
 
-before_install:
-  - export GALAXY_HOME=/home/galaxy
-  - export GALAXY_TRAVIS_USER=galaxy
-  - export GALAXY_UID=1450
-  - export GALAXY_GID=1450
-  - sudo groupadd -r $GALAXY_TRAVIS_USER -g $GALAXY_GID
-  - sudo useradd -u $GALAXY_UID -r -g $GALAXY_TRAVIS_USER -d $GALAXY_HOME -p travis_testing -c "Galaxy user" $GALAXY_TRAVIS_USER
-  - sudo mkdir $GALAXY_HOME
-  - sudo chown -R $GALAXY_TRAVIS_USER:$GALAXY_TRAVIS_USER $GALAXY_HOME
-  - sudo chmod -R 755 $GALAXY_HOME
-
 install:
-  # Install an upgraded pip and virtualenv
+  # Install git
   - sudo apt-get install git
-  - sudo apt-get install python-pip
-  - pip install virtualenv
-  - pip install --upgrade pip
 
-  # Install Ansible.
+  # Install Ansible
   - pip install ansible==2.5
 
-  # Add ansible.cfg to pick up roles path.
+  # Add ansible.cfg to pick up roles path
   - printf '[defaults]\nroles_path = ../' > ansible.cfg
 
 script:
-  - ansible-playbook -i "localhost, " -c local tests/test_playbook.yml
+  # Use sudo since we are using become from an unprivileged user to an unprivileged user, to work around:
+  #   https://docs.ansible.com/ansible/latest/user_guide/become.html#becoming-an-unprivileged-user
+  # On a real system, you would want to use one of the workarounds in the docs (of which this is the third)
+  - sudo $VIRTUAL_ENV/bin/ansible-playbook -i "localhost, " -c local tests/test_playbook.yml

README.md

@@ -163,7 +163,7 @@ Options for controlling where certain Galaxy components are placed on the filesy
 **User management and privilege separation**
 
 - `galaxy_separate_privileges` (default: `no`): Enable privilege separation mode.
-- `galaxy_user` (default: `galaxy`): The name of the system user under which Galaxy runs.
+- `galaxy_user` (default: user running ansible): The name of the system user under which Galaxy runs.
 - `galaxy_privsep_user` (default: `root`): The name of the system user that owns the Galaxy code, config files, and
   virtualenv (and dependencies therein).
 - `galaxy_group`: Common group between the Galaxy user and privilege separation user. If set and `galaxy_manage_paths`

defaults/main.yml

@@ -62,7 +62,7 @@ galaxy_remote_users: {}
 galaxy_separate_privileges: no
 
 # User that Galaxy runs as
-galaxy_user: galaxy
+galaxy_user: "{{ ansible_user_id }}"
 
 # User that owns Galaxy code, configs, and virutalenv, and that runs `pip install` for dependencies
 galaxy_privsep_user: root

tasks/clone.yml

@@ -35,7 +35,7 @@
         - email administrator with commit id
 
     - name: Include virtualenv setup tasks
-      include_tasks: virtualenv.yml
+      import_tasks: virtualenv.yml
 
     - name: Remove orphaned .pyc files and compile bytecode
       script: "makepyc.py {{ galaxy_server_dir }}/lib"

tasks/dependencies.yml

@@ -5,7 +5,7 @@
   block:
 
     - name: Include virtualenv setup tasks
-      include_tasks: virtualenv.yml
+      import_tasks: virtualenv.yml
 
     # virtualenv_command is still required if `virtualenv` isn't on $PATH, even if the venv already exists.
     - name: Install Galaxy base dependencies
@@ -33,6 +33,7 @@
       environment:
         PYTHONPATH: null
         VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
+      when: conditional_dependencies.stdout_lines | length > 0
 
   remote_user: "{{ galaxy_remote_users.privsep | default(omit) }}"
   become: "{{ galaxy_become_users.privsep is not undefined }}"

tasks/download.yml

@@ -29,7 +29,7 @@
       when: not download_receipt.stat.exists
 
     - name: Include virtualenv setup tasks
-      include_tasks: virtualenv.yml
+      import_tasks: virtualenv.yml
 
     - name: Remove orphaned .pyc files and compile bytecode
       script: makepyc.py {{ galaxy_server_dir }}/lib

tasks/layout.yml

@@ -12,8 +12,8 @@
     - galaxy_venv_dir
     - galaxy_server_dir
     - galaxy_config_dir
-    - galaxy_mutable_config_dir
     - galaxy_mutable_data_dir
+    - galaxy_mutable_config_dir
     - galaxy_shed_tools_dir
     - galaxy_cache_dir
 

tests/test_playbook.yml

@@ -6,11 +6,22 @@
   connection: local
   remote_user: travis
   vars:
-    galaxy_commit_id: release_18.05
+    galaxy_commit_id: release_18.09
+    galaxy_create_user: yes
+    galaxy_manage_paths: yes
     galaxy_manage_clone: yes
     galaxy_manage_download: no
-    galaxy_server_dir: /home/galaxy/server
     galaxy_config_style: yaml
+    galaxy_layout: root-dir
+    galaxy_root: /srv/galaxy
+    galaxy_separate_privileges: yes
+    galaxy_user: galaxy
+    galaxy_privsep_user: gxpriv
+    galaxy_config:
+      galaxy:
+        database_connection: sqlite:///{{ galaxy_mutable_data_dir }}/universe.sqlite
+    # needed because we've disabled facts
+    ansible_user_uid: "{{ lookup('env', 'UID') }}"
+    ansible_user_id: "{{ lookup('env', 'USER') }}"
   roles:
     - role: ansible-galaxy
-      become: yes