Add example docker-compose file

.github/linting.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/bash
+
+set -euxo pipefail
+
+# shellcheck disable=SC2044
+for book in $(find ./ -maxdepth 1 -name "*.yml"); do
+    if [ "$book" != "./handlers.yml" ]; then
+        ansible-lint "$book" -x braces,line-length
+    fi
+done
+# shellcheck disable=SC2044
+for dir in $(find ./roles -maxdepth 1 -type d); do
+    ansible-lint "$dir" -x braces,line-length
+done

.github/workflows/ansible-linting.yml

@@ -0,0 +1,22 @@
+name: Test contest deployment (ansible scripts)
+
+on: [push,pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      - name: Install ansible lint tools
+        run: sudo apt update; sudo pip install ansible-lint
+      - name: Lint the different scripts 
+        run: |
+          set -eux
+          ansible-lint --version
+          ansible-lint .
+        working-directory: provision-contest/ansible
+      - name: Lint the different scripts (Via the script)
+        run: ../../.github/linting.sh
+        working-directory: provision-contest/ansible
+

.github/workflows/shellcheck.yml

@@ -11,4 +11,4 @@ jobs:
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
         env:
-          SHELLCHECK_OPTS: -e SC1090
+          SHELLCHECK_OPTS: -e SC1090 -e SC2086 -e SC2046

README.md

@@ -7,6 +7,6 @@ developers, but might be of use for others too.
 
 The following subdirectories contain:
 * `website` the HTML code for www.domjudge.org
-* `icpc-wf` scripts used at the ICPC World Finals
+* `provision-contest` scripts used at ICPC style contests, such as the  World Finals
 * `contest-api` a script to validate an implementation of the
   [ICPC contest API](https://ccs-specs.icpc.io/contest_api)

contest-api/check-api.sh

@@ -14,7 +14,9 @@ languages
 problems
 groups
 organizations
+persons
 team-members
+accounts
 teams
 state
 submissions
@@ -30,6 +32,8 @@ scoreboard
 
 ENDPOINTS_OPTIONAL='
 team-members
+persons
+accounts
 awards
 commentary
 '

contest-api/json-schema/account.json

@@ -0,0 +1,23 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"title": "CLICS Contest API - account",
+	"description": "Definition of a single account object",
+
+	"type": "object",
+	"properties": {
+		"id": { "$ref": "common.json#/identifier" },
+		"username": { "type": "string" },
+		"password": { "type": ["string", "null"] },
+		"type": {
+			"oneOf": [
+				{ "enum": [ "team", "judge", "admin", "analyst", "staff" ] },
+				{ "type": "null" }
+			]
+		},
+		"ip": { "type": ["string", "null"] },
+		"team_id": { "$ref": "common.json#/identifierornull" },
+		"person_id": { "$ref": "common.json#/identifierornull" }
+	},
+	"required": ["id", "username", "type"],
+	"$ref": "common.json#/strictproperties"
+}

contest-api/json-schema/accounts.json

@@ -0,0 +1,12 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"title": "CLICS Contest API: accounts",
+	"description": "JSON response of this API call",
+
+	"type": "array",
+	"uniqueItems": true,
+	"$ref": "common.json#/nonemptyarray",
+	"items": {
+		"$ref": "account.json#"
+	}
+}

contest-api/json-schema/common.json

@@ -11,7 +11,9 @@
 			"problems",
 			"groups",
 			"organizations",
+			"persons",
 			"team-members",
+			"accounts",
 			"teams",
 			"state",
 			"submissions",

contest-api/json-schema/event-feed.json

@@ -22,7 +22,9 @@
 						{ "$ref": "group.json#" },
 						{ "$ref": "organization.json#" },
 						{ "$ref": "team.json#" },
+						{ "$ref": "person.json#" },
 						{ "$ref": "team-member.json#" },
+						{ "$ref": "account.json#" },
 						{ "$ref": "state.json#" },
 						{ "$ref": "submission.json#" },
 						{ "$ref": "judgement.json#" },

contest-api/json-schema/person.json

@@ -0,0 +1,25 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"title": "CLICS Contest API - person",
+	"description": "Definition of a single person object",
+
+	"type": "object",
+	"properties": {
+		"id": { "$ref": "common.json#/identifier" },
+		"team_id": { "$ref": "common.json#/identifier" },
+		"icpc_id": { "type": [ "string", "null" ] },
+		"name": { "type": "string" },
+		"title": { "type": [ "string", "null" ] },
+		"email": { "type": [ "string", "null" ] },
+		"sex": {
+			"oneOf": [
+				{ "enum": [ "male", "female" ] },
+				{ "type": "null" }
+			]
+		},
+		"role": { "enum": [ "contestant", "coach", "staff" ] },
+		"photo": { "$ref": "common.json#/imagerefsornull" }
+	},
+	"required": ["id", "team_id", "name", "role"],
+	"$ref": "common.json#/strictproperties"
+}

contest-api/json-schema/persons.json

@@ -0,0 +1,12 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"title": "CLICS Contest API: persons",
+	"description": "JSON response of this API call",
+
+	"type": "array",
+	"uniqueItems": true,
+	"$ref": "common.json#/nonemptyarray",
+	"items": {
+		"$ref": "person.json#"
+	}
+}

domlogo/domlogo.py

@@ -5,6 +5,7 @@
 import os
 import requests
 import re
+import time
 
 font = ('Roboto', 14)
 team_image = sg.Image(filename='domlogo-files/photos/idle.png')
@@ -41,18 +42,21 @@
 api_url = f'{api_url}/contests/{cid}'
 print(f'Contest is {cid}.')
 
-latest_logfile = max(glob.glob('output/log/judge.*-0.log'), key=os.path.getctime)
+latest_logfile = max(glob.glob('output/log/judge.*-2.log'), key=os.path.getctime)
 print(f'Checking logfile {latest_logfile}')
 with open(latest_logfile, 'r') as logfile:
     # Seeks to the end of the file.
     logfile.seek(0, 2)
     results = []
     last_seen, needs_update = (None, None)
     while True:
-        event, values = window.read(timeout=10)
+        event, values = window.read(timeout=30)
         if event == sg.WIN_CLOSED:
             break
         line = logfile.readline()
+        # Sleep here for a tiny amount of time to avoid using too much CPU.
+        if len(line) == 0:
+            time.sleep(0.01)
         if 'Working directory:' in line:
             token = line.strip().split('/')
             judging_id = token[-1]
@@ -65,10 +69,9 @@
                 team_id = submission_data['team_id']
                 last_seen = (submission_id, judging_id, team_id)
                 new_filename = f'domlogo-files/photos/{team_id}.png'
-                if team_id>=120:
-                    team_image.update(filename=new_filename)
-                f'domlogo-files/photos/{team_id}.png')
-                team_image.update(filename=f'domlogo-files/photos/{team_id}.png')
+                if (int)(team_id) >= 120:
+                    new_filename = f'domlogo-files/photos/crew.png'
+                team_image.update(filename=new_filename)
                 metadata_text.update(f's{submission_id} / {submission_data["problem_id"]} / {submission_data["language_id"]}')
                 results_text.update('Busy compiling.')
         elif 'No submissions in queue' in line:
@@ -96,6 +99,8 @@
                 color = 'DeepSkyBlue'
             for i in range(len(cache)-1):
                 cache[i] = cache[i+1]
+            if (int)(tid) >= 120:
+                tid = 'DOMjudge'
             cache[-1] = (f'domlogo-files/logos/{tid}.png', f's{sid}/j{jid}\n{verdict}', color, jid)
             for i in range(len(cache)):
                 previous_column[i][0].update(filename=cache[i][0])