Complete site's build settings.

The build settings is basically a repository into object underneath.
This changes the definition to reuse the RepoInfo struct. `repo_branch`
is used a read/write attribute to set the production branch for a site.

Signed-off-by: David Calavera <[email protected]>

Author: calavera

go/models/repo_info.go

@@ -1406,25 +1406,14 @@ definitions:
                 pretty_urls:
                   type: boolean
         build_settings:
-          type: object
-          properties:
-            branch:
-              type: string
-            dir:
-              type: string
-            cmd:
-              type: string
-            allowed_branches:
-              type: array
-              items:
-                type: string
+          $ref: "#/definitions/repoInfo"
     siteSetup:
       allOf:
         - $ref: "#/definitions/site"
         - properties:
             repo:
-              $ref: "#/definitions/repoSetup"
-    repoSetup:
+              $ref: "#/definitions/repoInfo"
+    repoInfo:
       type: object
       properties:
         id:
@@ -1435,7 +1424,7 @@ definitions:
           type: string
         repo:
           type: string
-        branch:
+        repo_branch:
           type: string
         dir:
           type: string
@@ -1449,6 +1438,12 @@ definitions:
           type: boolean
         private_logs:
           type: boolean
+        repo_url:
+          type: string
+        env:
+          type: object
+          additionalProperties:
+            type: string
     submission:
       type: object
       properties:

go/models/site.go

@@ -2752,7 +2752,7 @@
         }
       }
     },
-    "repoSetup": {
+    "repoInfo": {
       "type": "object",
       "properties": {
         "allowed_branches": {
@@ -2761,9 +2761,6 @@
             "type": "string"
           }
         },
-        "branch": {
-          "type": "string"
-        },
         "cmd": {
           "type": "string"
         },
@@ -2773,6 +2770,12 @@
         "dir": {
           "type": "string"
         },
+        "env": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
         "id": {
           "type": "integer"
         },
@@ -2787,6 +2790,12 @@
         },
         "repo": {
           "type": "string"
+        },
+        "repo_branch": {
+          "type": "string"
+        },
+        "repo_url": {
+          "type": "string"
         }
       }
     },
@@ -2803,24 +2812,7 @@
           "type": "string"
         },
         "build_settings": {
-          "type": "object",
-          "properties": {
-            "allowed_branches": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            "branch": {
-              "type": "string"
-            },
-            "cmd": {
-              "type": "string"
-            },
-            "dir": {
-              "type": "string"
-            }
-          }
+          "$ref": "#/definitions/repoInfo"
         },
         "capabilities": {
           "type": "object",
@@ -2939,7 +2931,7 @@
         {
           "properties": {
             "repo": {
-              "$ref": "#/definitions/repoSetup"
+              "$ref": "#/definitions/repoInfo"
             }
           }
         }