From 2596ed3827c58ed4a18bcfccbbd99201c83d978f Mon Sep 17 00:00:00 2001
From: Artem Metla <ametla@google.com>
Date: Mon, 23 Sep 2024 12:05:59 +0200
Subject: [PATCH] kernelCTF: server: update to latest version

---
 kernelctf/server/refresh_slots.py |   3 +-
 kernelctf/server/releases.yaml    | 100 +++++++++++++++++++++++++++++-
 kernelctf/server/server.py        |   3 +-
 3 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/kernelctf/server/refresh_slots.py b/kernelctf/server/refresh_slots.py
index db5bca5ef..05290516e 100755
--- a/kernelctf/server/refresh_slots.py
+++ b/kernelctf/server/refresh_slots.py
@@ -27,7 +27,8 @@ def fetch(url):
 for row in publicSheet:
     for slot in [row["LTS slot"], row["COS slot"]]:
         if slot != "" and not slot.startswith("("):
-            slots[slot] = row["ID"]
+            slot = slot.split(' (')[0]
+            slots[slot] = (slots[slot] + ", " if slot in slots else "") + row["ID"]
 slots = dict(sorted(slots.items()))
 
 print("Taken slots:")
diff --git a/kernelctf/server/releases.yaml b/kernelctf/server/releases.yaml
index 62b872eac..5340ea14f 100644
--- a/kernelctf/server/releases.yaml
+++ b/kernelctf/server/releases.yaml
@@ -1,3 +1,101 @@
+lts-6.6.52:
+  release-date: 2024-09-27T12:00:00Z
+cos-105-17412.448.36:
+  release-date: 2024-09-27T12:00:00Z
+cos-109-17800.309.59:
+  release-date: 2024-09-27T12:00:00Z
+
+lts-6.6.50:
+  release-date: 2024-09-13T12:00:00Z
+cos-105-17412.448.22:
+  release-date: 2024-09-13T12:00:00Z
+cos-109-17800.309.33:
+  release-date: 2024-09-13T12:00:00Z
+  
+lts-6.6.47:
+  release-date: 2024-08-30T12:00:00Z
+cos-105-17412.448.12:
+  release-date: 2024-08-30T12:00:00Z
+cos-109-17800.309.20:
+  release-date: 2024-08-30T12:00:00Z
+
+lts-6.6.45:
+  release-date: 2024-08-16T12:00:00Z
+cos-105-17412.370.78:
+  release-date: 2024-08-16T12:00:00Z
+cos-109-17800.309.7:
+  release-date: 2024-08-16T12:00:00Z
+
+lts-6.6.42:
+  release-date: 2024-07-31T12:00:00Z
+cos-105-17412.370.75:
+  release-date: 2024-07-31T12:00:00Z
+cos-109-17800.218.76:
+  release-date: 2024-07-31T12:00:00Z
+
+lts-6.6.38:
+  release-date: 2024-07-12T12:00:00Z
+cos-105-17412.370.67:
+  release-date: 2024-07-12T12:00:00Z
+cos-109-17800.218.69:
+  release-date: 2024-07-12T12:00:00Z
+
+lts-6.6.35:
+  release-date: 2024-06-28T12:00:00Z
+cos-105-17412.370.58:
+  release-date: 2024-06-28T12:00:00Z
+cos-109-17800.218.61:
+  release-date: 2024-06-28T12:00:00Z
+
+lts-6.6.31:
+  release-date: 2024-06-14T12:00:00Z
+cos-105-17412.370.44:
+  release-date: 2024-06-14T12:00:00Z
+cos-109-17800.218.44:
+  release-date: 2024-06-14T12:00:00Z
+
+lts-6.6.32:
+  release-date: 2024-05-31T12:00:00Z
+cos-105-17412.370.34:
+  release-date: 2024-05-31T12:00:00Z
+cos-109-17800.218.32:
+  release-date: 2024-05-31T12:00:00Z
+  
+lts-6.6.30:
+  release-date: 2024-05-17T12:00:00Z
+cos-109-17800.218.20:
+  release-date: 2024-05-17T12:00:00Z
+cos-105-17412.370.23:
+  release-date: 2024-05-17T12:00:00Z
+
+lts-6.6.28:
+  release-date: 2024-05-03T12:00:00Z
+cos-109-17800.147.60:
+  release-date: 2024-05-03T12:00:00Z
+cos-105-17412.294.68:
+  release-date: 2024-05-03T12:00:00Z
+
+lts-6.6.27:
+  release-date: 2024-04-19T12:00:00Z
+cos-109-17800.147.54:
+  release-date: 2024-04-19T12:00:00Z
+cos-105-17412.294.62:
+  release-date: 2024-04-19T12:00:00Z
+
+lts-6.6.23:
+  release-date: 2024-04-05T12:00:00Z
+cos-109-17800.147.41:
+  release-date: 2024-04-05T12:00:00Z
+cos-105-17412.294.48:
+  release-date: 2024-04-05T12:00:00Z
+
+lts-6.1.81:
+  release-date: 2024-03-22T12:00:00Z
+cos-97-16919.450.26:
+  release-date: 2024-03-22T12:00:00Z
+cos-105-17412.294.36:
+  release-date: 2024-03-22T12:00:00Z
+
 lts-6.1.79:
   release-date: 2024-03-08T12:00:00Z
 cos-105-17412.294.34:
@@ -136,4 +234,4 @@ mitigation-6.1-broken:
   release-date: 2023-06-14T16:00:00Z
   deprecated: true
   vmlinux: false
-  available-until: 2023-07-08T17:20:00Z
\ No newline at end of file
+  available-until: 2023-07-08T17:20:00Z
diff --git a/kernelctf/server/server.py b/kernelctf/server/server.py
index a7090363f..3460cf9a8 100755
--- a/kernelctf/server/server.py
+++ b/kernelctf/server/server.py
@@ -14,6 +14,7 @@
 
 RELEASES_YAML = 'releases.yaml'
 SLOTS_JSON = 'slots.json'
+DEPRECATED_TARGETS = ["cos-97"]
 
 sys.path.append('/usr/local/lib/python3.9/dist-packages')
 from httplib2 import Http
@@ -61,7 +62,7 @@ def get_releases():
 
         target = m.group('target')
 
-        if released and not release.get('deprecated', False):
+        if released and not release.get('deprecated', False) and target not in DEPRECATED_TARGETS:
             if not target in target_latest or target_latest[target]['release-date'] < release['release-date']:
                 target_latest[target] = release