Add support for reverting Galaxy and revert.

env/main/files/galaxy/galaxy_version.yml

@@ -1,3 +1,3 @@
 ---
 galaxy_version: 18.01.rc1
-galaxy_commit: ab928fe55ed1f871dbe6221e95af199579f312e1
+galaxy_commit: fa283b525f4412fbc3d05ad10feb7176b52a27f3

env/main/group_vars/all.yml

@@ -3,7 +3,8 @@
 instance_root: /srv/galaxy/main
 # NOTE: When you change this from a release to a pre-release branch, enable client building on update in
 # group_vars/cvmfsstratum0servers.yml. When that branch becomes stable, disable client building.
-galaxy_branch: usegalaxy
+#galaxy_branch: usegalaxy
+galaxy_ref: fa283b525f4412fbc3d05ad10feb7176b52a27f3
 galaxy_user: g2main
 galaxy_privileged_user: gxsrc
 galaxy_instance_hostname: usegalaxy.org

roles/usegalaxy_cvmfs/tasks/update.yml

@@ -11,15 +11,22 @@
     url: "https://api.github.com/repos/{{ galaxy_repo_owner }}/galaxy/branches/{{ galaxy_branch }}"
     return_content: yes
   register: branch_response
+  when: galaxy_branch is defined
 
-- name: Set galaxy_commit fact
+- name: Set upstream_galaxy_commit fact
   set_fact:
-    galaxy_commit: "{{ branch_response.json.commit.sha }}"
+    upstream_galaxy_commit: "{{ branch_response.json.commit.sha }}"
+  when: galaxy_branch is defined
 
-- name: Exit if no changes
+- name: Exit if no changes (branch mode)
   fail:
-    msg: The clone at /cvmfs/{{ galaxy_cvmfs_repo }}/galaxy is already at the HEAD of {{ galaxy_repo_owner }}/galaxy@{{ galaxy_branch }} ({{ galaxy_commit }})
-  when: galaxy_commit_old.stdout == galaxy_commit
+    msg: The clone at /cvmfs/{{ galaxy_cvmfs_repo }}/galaxy is already at the HEAD of {{ galaxy_repo_owner }}/galaxy@{{ galaxy_branch }} ({{ upstream_galaxy_commit }})
+  when: galaxy_branch is defined and galaxy_commit_old.stdout == galaxy_commit
+
+- name: Exit if no changes (ref mode)
+  fail:
+    msg: The clone at /cvmfs/{{ galaxy_cvmfs_repo }}/galaxy is already at {{ galaxy_ref }})
+  when: galaxy_ref is defined and galaxy_commit_old.stdout == galaxy_ref
 
 - name: Begin CVMFS transaction
   command: /usr/bin/cvmfs_server transaction {{ galaxy_cvmfs_repo }}
@@ -28,7 +35,7 @@
   block:
 
     - name: Update Galaxy
-      command: "docker run --rm -v /cvmfs:/cvmfs galaxy/update su - {{ galaxy_user }} -c \"/cvmfs/{{ galaxy_cvmfs_repo }}/bin/update_galaxy.sh -b {{ galaxy_branch }} {{ '-o ' ~ galaxy_repo_owner if galaxy_repo_owner != 'galaxyproject' else '' }}\""
+      command: "docker run --rm -v /cvmfs:/cvmfs galaxy/update su - {{ galaxy_user }} -c \"/cvmfs/{{ galaxy_cvmfs_repo }}/bin/update_galaxy.sh {{ '-r ' ~ galaxy_ref if galaxy_ref is defined else '' }} {{ '-b ' ~ galaxy_branch if galaxy_branch is defined else '' }} {{ '-o ' ~ galaxy_repo_owner if galaxy_repo_owner != 'galaxyproject' else '' }}\""
 
     - name: Fetch Galaxy version
       command: "/usr/bin/docker run --rm -v /cvmfs:/cvmfs -e PYTHONPATH=/cvmfs/{{ galaxy_cvmfs_repo }}/galaxy/lib galaxy/update su {{ galaxy_user }} -c \"/cvmfs/{{ galaxy_cvmfs_repo }}/venv/bin/python -c 'from galaxy.version import VERSION; print VERSION'\""
@@ -38,6 +45,16 @@
       set_fact:
         galaxy_version: "{{ version_response.stdout }}"
 
+    - name: Fetch new Galaxy commit hash
+      command: "/usr/bin/git rev-parse HEAD"
+      args:
+        chdir: /cvmfs/{{ galaxy_cvmfs_repo }}/galaxy
+      register: galaxy_commit_out
+
+    - name: Set galaxy_commit fact
+      set_fact:
+        galaxy_commit: "{{ galaxy_commit_out.stdout }}"
+
     - name: Store updated version information
       local_action:
         module: copy