Fix TeamCity build

AsteroidOS · Apr 4, 2022 · 19a1de7 · 19a1de7
1 parent f550c4e
commit 19a1de7
Show file tree

Hide file tree

Showing 3 changed files with 253 additions and 230 deletions.
diff --git a/.teamcity/asteroid/AsteroidProject.kt b/.teamcity/asteroid/AsteroidProject.kt
@@ -9,73 +9,73 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.activeStorag
 import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.versionedSettings
 
 object AsteroidProject : Project({
-    description = "Base Asteroid Project"
+	description = "Base Asteroid Project"
 
-    // Attach vcsRoots from CoreVCS
-    for (vcs in CoreVCS.all())
-        if (vcs != CoreVCS.MetaSmartwatch)
-            vcsRoot(vcs)
+	// Attach vcsRoots from CoreVCS
+	for (vcs in CoreVCS.all())
+		if (vcs != CoreVCS.MetaSmartwatch)
+			vcsRoot(vcs)
 
-    // Attach InitWorkspace build
-    buildType(InitWorkspace)
+	// Attach InitWorkspace build
+	buildType(InitWorkspace)
 
-    // Attach the subProjects
-    // TODO: Link to subprojects externally
-    subProjects(
-        asteroid.devices.DevicesProject,
-        asteroid.packages.PackagesProject,
-        asteroid.thirdparty.ThirdPartyProject
-    )
+	// Attach the subProjects
+	// TODO: Link to subprojects externally
+	subProjects(
+		asteroid.devices.DevicesProject,
+		asteroid.packages.PackagesProject,
+		asteroid.thirdparty.ThirdPartyProject
+	)
 
-    // Define the build parameters inherited by the subprojects
-    params {
-        text(
-            "system.sstate.server.location",
-            "/var/www/asteroidos",
-            label = "Sstate server location",
-            description = "Path location of the sstate-cache",
-            readOnly = true, allowEmpty = true
-        )
-        text(
-            "system.sstate.server.user",
-            "asteroidos",
-            label = "SState server user",
-            description = "Username used to upload sstate-cache",
-            readOnly = true,
-            allowEmpty = true
-        )
-        text(
-            "system.sstate.server.upload_address",
-            "192.168.0.2",
-            label = "SState server backend address",
-            description = "Backend address to upload the sstate-cache",
-            readOnly = true,
-            allowEmpty = false
-        )
-        text(
-            "system.sstate.server.address",
-            "https://sstate.asteroid.org",
-            label = "SState server public address",
-            description = "Public address serving sstate-cache",
-            readOnly = true,
-            allowEmpty = false
-        )
-    }
+	// Define the build parameters inherited by the subprojects
+	params {
+		text(
+			"system.sstate.server.address",
+			Settings.sstateServer.url,
+			label = "SState server public address",
+			description = "Public address serving sstate-cache",
+			readOnly = true,
+			allowEmpty = false
+		)
+		if (Settings.deploySstate) {
+			text(
+				"system.sstate.server.location",
+				Settings.sstateServer.location ?: "",
+				label = "Sstate server location",
+				description = "Path location of the sstate-cache",
+				readOnly = true, allowEmpty = true
+			)
+			text(
+				"system.sstate.server.user",
+				Settings.sstateServer.user ?: "",
+				label = "SState server user",
+				description = "Username used to upload sstate-cache",
+				readOnly = true, allowEmpty = true
+			)
+			text(
+				"system.sstate.server.upload_address",
+				Settings.sstateServer.backendUrl ?: "",
+				label = "SState server backend address",
+				description = "Backend address to upload the sstate-cache",
+				readOnly = true, allowEmpty = false
+			)
+		}
+	}
 
-    features {
-        activeStorage {
-            activeStorageID = "DefaultStorage"
-        }
-    }
-}){
-    override fun validate(consumer: ErrorConsumer) {
-        super.validate(consumer)
-        if (Settings.deploySstate){
-            // TODO: check that SSH key is present
-            //  Currently this feature is unavailable
-        }
-        if (Settings.pullRequests || Settings.commitStatus){
-            // TODO: check that SSH key and and OAuth token are present
-        }
-    }
+	features {
+		activeStorage {
+			activeStorageID = "DefaultStorage"
+		}
+	}
+}) {
+	override fun validate(consumer: ErrorConsumer) {
+		super.validate(consumer)
+		if (Settings.deploySstate) {
+			// TODO: check that SSH key is present
+			//  Currently this feature is unavailable
+		}
+		if (Settings.pullRequests || Settings.commitStatus) {
+			// TODO: check that SSH key and and OAuth token are present
+		}
+	}
 }