Fixes @vmcj's nits

Author: tuupke

provision-contest/ansible/EOC/README.md

@@ -1,5 +1,5 @@
 ## DOMjudge EOC ansible helper
-This ansible playbook should automate must of the tasks DOMjudge needs to perform for the End Of Contest procedures during the ICPC WF's. It was created for the WF 2021 in Dhaka, which took place in 2022.
+This ansible playbook should automate most of the tasks DOMjudge needs to perform for the End Of Contest procedures during the ICPC WF's. It was created for the WF 2021 in Dhaka, which took place in 2022.
 
 Two types of authentication are used and supported. Session based auth and basic auth.
  - Session based auth retrieves a CSRF token and fakes a login action.
@@ -15,7 +15,7 @@ The following steps from the EOC 2022-Oct document have been automated:
 29. `Primary pushes results.tsv into git repo`. Tag for just this action: `results.tsv`. Note, a manual commit is still needed!
 32. `Compare scoreboard.json between primary and shadow`. Tag for just this action: `scoreboard`. Note, only if other (shadow or primary) credentials are provided.
 33. `Compare awards.json between primary and CDS`. Tag for just this action: `awards`. Note, only if CDS credentials are provided.
-36. `Verify that Primary and ... System Test`. Tag for just this action: `fetch`. Note, a manual commit is still needed and the `final_standings.html` is actually the static-scoreboard zip.
+36. `Verify that Primary and ... System Test`. Tag for just this action: `fetch`. Note, a manual commit is still needed. The static scoreboard (zip) and an export of the clarifications is also pulled from DOMjudge.
 
 
 ## Setup

provision-contest/ansible/EOC/main.yml

@@ -27,7 +27,6 @@
         other_basic_auth: "Basic {{ (other_username+':'+other_password) | b64encode }}"
       when: other_available
 
-
     - name: Attempt login into DOMjudge
       tags: all, fetch, results.tsv
       block:
@@ -63,7 +62,6 @@
             headers:
               cookie: "{{ login_response.set_cookie }}"
 
-
     - name: Download results.tsv
       tags: all, results.tsv
       ansible.builtin.uri:
@@ -99,17 +97,6 @@
           register: other_scoreboard
           when: other_available
 
-#        - name: Convert scoreboard to nice json
-#          block:
-#          - name: Convert DOMjudge scoreboard to nice json
-#            ansible.builtin.set_fact:
-#              dj_scoreboard_nice: "{{ dj_scoreboard.json | to_nice_json }}"
-#
-#          - name: Convert other scoreboard to nice json
-#            ansible.builtin.set_fact:
-#              other_scoreboard_nice: "{{ other_scoreboard.json | to_nice_json }}"
-#            when: other_available
-
         - name: Does Dj == other for scoreboard
           shell: "{{ jd_loc }} /tmp/scoreboard.dj.json /tmp/scoreboard.other.json"
           when: other_available
@@ -140,17 +127,6 @@
           register: cds_awards
           when: cds_available
 
-#        - name: Convert awards to nice json
-#          block:
-#          - name: Convert DOMjudge awards to nice json
-#            ansible.builtin.set_fact:
-#              dj_awards_nice: "{{ dj_awards.json | to_nice_json }}"
-#
-#          - name: Convert cds awards to nice json
-#            ansible.builtin.set_fact:
-#              cds_awards_nice: "{{ cds_awards.json | to_nice_json }}"
-#            when: cds_available
-
         - name: Does Dj == CDS for awards
           shell: "{{ jd_loc }} /tmp/awards.dj.json /tmp/awards.cds.json"
           when: cds_available
@@ -190,12 +166,30 @@
         - scoreboard
         - teams
 
-    - name: "Store final standings (contest.zip)"
+    - name: "Store final_standings.html (results.html)"
+      tags: all, fetch
+      ansible.builtin.uri:
+        url: "{{ dj_url }}/jury/import-export/export/results.html"
+        creates: "{{ repo }}/final_standings.html"
+        dest: "{{ repo }}/final_standings.html"
+        headers:
+          cookie: "{{ login_response.set_cookie }}"
+
+    - name: "Store (clarifications.html)"
+      tags: all, fetch
+      ansible.builtin.uri:
+        url: "{{ dj_url }}/jury/import-export/export/clarifications.html"
+        creates: "{{ repo }}/clarifications.html"
+        dest: "{{ repo }}/clarifications.html"
+        headers:
+          cookie: "{{ login_response.set_cookie }}"
+
+    - name: "Store final scoreboard (contest.zip)"
       tags: all, fetch
       ansible.builtin.uri:
         url: "{{ dj_url }}/public/scoreboard-data.zip?contest={{ contest_id }}"
-        creates: "{{ repo }}/final_standings.zip"
-        dest: "{{ repo }}/final_standings.zip"
+        creates: "{{ repo }}/final_scoreboard.zip"
+        dest: "{{ repo }}/final_scoreboard.zip"
         headers:
           cookie: "{{ login_response.set_cookie }}"