modified scaffold for 26, and configs templates (#982)

Author: nour-massri

saturn/development/configs/compile.template.json

@@ -1,23 +1,23 @@
 {
-    "episode": {
-        "name": "bc25java",
-        "language": "java21",
-        "scaffold": "https://github.com/battlecode/battlecode25-scaffold"
+  "episode": {
+    "name": "bc26",
+    "language": "java21",
+    "scaffold": "https://github.com/battlecode/battlecode26-scaffold"
+  },
+  "metadata": {
+    "report-url": "{{REPORT_PATH}}",
+    "task-type": "compile"
+  },
+  "details": {
+    "source": {
+      "bucket": "local",
+      "name": "/development/test-data/source/bc26-java21.zip"
     },
-    "metadata": {
-        "report-url": "{{REPORT_PATH}}",
-        "task-type": "compile"
+    "binary": {
+      "bucket": "local",
+      "name": "{{BINARY_PATH}}"
     },
-    "details": {
-        "source": {
-            "bucket": "local",
-            "name": "/development/test-data/source/java21.zip"
-        },
-        "binary": {
-            "bucket": "local",
-            "name": "{{BINARY_PATH}}"
-        },
-        "team-name": "test",
-        "package": "examplefuncsplayer"
-    }
+    "team-name": "test",
+    "package": "examplefuncsplayer"
+  }
 }

saturn/development/configs/execute.template.json

@@ -1,49 +1,43 @@
 {
-    "episode": {
-        "name": "bc25java",
-        "language": "java21",
-        "scaffold": "https://github.com/battlecode/battlecode25-scaffold"
+  "episode": {
+    "name": "bc26",
+    "language": "java21",
+    "scaffold": "https://github.com/battlecode/battlecode26-scaffold"
+  },
+  "metadata": {
+    "report-url": "{{REPORT_PATH}}",
+    "task-type": "execute"
+  },
+  "details": {
+    "maps": ["DefaultSmall", "DefaultMedium", "DefaultLarge"],
+    "replay": {
+      "bucket": "local",
+      "name": "{{REPLAY_PATH}}"
     },
-    "metadata": {
-        "report-url": "{{REPORT_PATH}}",
-        "task-type": "execute"
+    "alternate-order": true,
+    "a": {
+      "source": {
+        "bucket": "local",
+        "name": "/development/test-data/source/bc26-java21.zip"
+      },
+      "binary": {
+        "bucket": "local",
+        "name": "/development/test-data/binary/bc26-java21.zip"
+      },
+      "team-name": "test1",
+      "package": "examplefuncsplayer"
     },
-    "details": {
-        "maps": [
-                "fix",
-                "galaxy",
-                "gridworld",
-                "quack",
-                "sierpinski"
-        ],
-        "replay": {
-            "bucket": "local",
-            "name": "{{REPLAY_PATH}}"
-        },
-        "alternate-order": true,
-        "a": {
-            "source": {
-                "bucket": "local",
-                "name": "/development/test-data/source/java21.zip"
-            },
-            "binary": {
-                "bucket": "local",
-                "name": "/development/test-data/binary/java21.zip"
-            },
-            "team-name": "test1",
-            "package": "examplefuncsplayer"
-        },
-        "b": {
-            "source": {
-                "bucket": "local",
-                "name": "/development/test-data/source/java21.zip"
-                },
-            "binary": {
-                "bucket": "local",
-                "name": "/development/test-data/binary/java21.zip"
-            },
-            "team-name": "test2",
-            "package": "examplefuncsplayer"
-        }
+    "b": {
+      "source": {
+        "bucket": "local",
+        "name": "/development/test-data/source/bc26-java21.zip"
+      },
+      "binary": {
+        "bucket": "local",
+        "name": "/development/test-data/binary/bc26-java21.zip"
+      },
+      "team-name": "test2",
+      "package": "examplefuncsplayer"
     }
+  }
 }

saturn/pkg/run/gcs.go

@@ -24,7 +24,7 @@ func NewGCSClient(ctx context.Context, onSaturn bool) (*GCSClient, error) {
 	if err != nil {
 		return nil, fmt.Errorf("storage.NewClient: %v", err)
 	}
-	return &GCSClient{client, false}, nil
+	return &GCSClient{client, onSaturn}, nil
 }
 
 func (c *GCSClient) GetFile(ctx context.Context, f FileSpecification, w io.Writer) error {

saturn/pkg/run/scaffold.go

@@ -127,14 +127,16 @@ func NewScaffold(ctx context.Context, episode saturn.Episode, repo *git.Reposito
 		return &s.Scaffold, nil
 	case saturn.Java21:
 		// Modern java21 scaffolds store java in the 'java' subdirectory of the scaffold
-		javaRoot := filepath.Join(root, "java")
+		// javaRoot := filepath.Join(root, "java")
+		javaRoot := root
 		s, err := NewJavaScaffold(ctx, episode, repo, javaRoot, "/opt/java/openjdk", onSaturn)
 		if err != nil {
 			return nil, fmt.Errorf("NewJavaScaffold (Java21): %v", err)
 		}
 		return &s.Scaffold, nil
 	case saturn.Python3:
-		pyRoot := filepath.Join(root, "python")
+		// pyRoot := filepath.Join(root, "python")
+		pyRoot := root
 		s, err := NewPython3Scaffold(ctx, episode, repo, pyRoot, "python3.12", onSaturn)
 		if err != nil {
 			return nil, fmt.Errorf("NewPython3Scaffold: %v", err)