SCP-2940: Update for plutus repository split

input-output-hk · Oct 28, 2021 · 8d82f4d · 8d82f4d
1 parent d8a3ac6
commit 8d82f4d
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 65 deletions.
diff --git a/clusters/plutus/playground/default.nix b/clusters/plutus/playground/default.nix
@@ -41,7 +41,7 @@ in {
 
     staging.description = "Staging";
 
-    wyohack.description = "Marlowe - Wyoming Hackathon 2021";
+    plutus-staging.description = "Plutus Apps Staging";
   };
 
   users.extraUsers.root.openssh.authorizedKeys.keys = pkgs.ssh-keys.devOps ++ [

diff --git a/deploy.cue b/deploy.cue
@@ -20,17 +20,23 @@ Namespace: [Name=_]: {
 		namespace:   Name
 		#domain:     string
 		#fqdn:       fqdn
-		#plutusRev:     =~"^\(hex){40}$"
+		#revs: [string]: =~"^\(hex){40}$"
+		#variant:    string
 		#flakes: [string]: types.#flake
 
 		#flakes: {
-			webGhcServer:                =~flakePath | *"github:input-output-hk/plutus?rev=\(#plutusRev)#web-ghc-server-entrypoint"
-			"plutus-playground-server":  =~flakePath | *"github:input-output-hk/plutus?rev=\(#plutusRev)#plutus-playground-server-entrypoint"
-			"plutus-playground-client":  =~flakePath | *"github:input-output-hk/plutus?rev=\(#plutusRev)#plutus-playground-client-entrypoint"
-			"marlowe-playground-server": =~flakePath | *"github:input-output-hk/plutus?rev=\(#plutusRev)#marlowe-playground-server-entrypoint"
-			"marlowe-playground-client": =~flakePath | *"github:input-output-hk/plutus?rev=\(#plutusRev)#marlowe-playground-client-entrypoint"
-			marloweRun:                  =~flakePath | *"github:input-output-hk/plutus?rev=\(#plutusRev)#marlowe-run-entrypoint"
-			marloweWebsite:              =~flakePath | *"github:input-output-hk/plutus?rev=\(#plutusRev)#marlowe-website-entrypoint"
+			if #variant == "plutus" {
+				webGhcServer:                =~flakePath | *"github:input-output-hk/plutus-apps?rev=\(#revs.plutus)#web-ghc-server-entrypoint"
+				"plutus-playground-server":  =~flakePath | *"github:input-output-hk/plutus-apps?rev=\(#revs.plutus)#plutus-playground-server-entrypoint"
+				"plutus-playground-client":  =~flakePath | *"github:input-output-hk/plutus-apps?rev=\(#revs.plutus)#plutus-playground-client-entrypoint"
+			}
+			if #variant == "marlowe" {
+				webGhcServer:                =~flakePath | *"github:input-output-hk/marlowe-cardano?rev=\(#revs.marlowe)#web-ghc-server-entrypoint"
+				"marlowe-playground-server": =~flakePath | *"github:input-output-hk/marlowe-cardano?rev=\(#revs.marlowe)#marlowe-playground-server-entrypoint"
+				"marlowe-playground-client": =~flakePath | *"github:input-output-hk/marlowe-cardano?rev=\(#revs.marlowe)#marlowe-playground-client-entrypoint"
+				marloweRun:                  =~flakePath | *"github:input-output-hk/marlowe-cardano?rev=\(#revs.marlowe)#marlowe-run-entrypoint"
+				marloweWebsite:              =~flakePath | *"github:input-output-hk/marlowe-website?rev=\(#revs.marloweWebsite)#marlowe-website-entrypoint"
+			}
 		}
 
 		#rateLimit: {
@@ -45,52 +51,57 @@ Namespace: [Name=_]: {
 #jobs: {
 	#namespace: string
 	#portBase: uint
+	#variant: string
 
 	"web-ghc-server": jobDef.#WebGhcServerJob & {
 		#domain: "web-ghc-\(#namespace).\(fqdn)"
 		#port: #portBase
 	}
-	"plutus-playground": jobDef.#PlutusPlaygroundJob & {
-		if #namespace == "plutus-apps-prod" {
-			#domain:      "playground.plutus.iohkdev.io"
-		}
-		if #namespace != "plutus-apps-prod" {
-			#domain:      "plutus-playground-\(#namespace).\(fqdn)"
-		}
-		#domainNS:    #namespace
-		#variant:     "plutus"
-		#clientPort:  #portBase + 1
-		#serverPort:  #portBase + 2
-	}
-	"marlowe-playground": jobDef.#PlutusPlaygroundJob & {
-		if #namespace == "prod" {
-			#domain:      "play.marlowe-finance.io"
-		}
-		if #namespace != "prod" {
-			#domain:      "marlowe-playground-\(#namespace).\(fqdn)"
-		}
-		#domainNS:    #namespace
-		#variant:     "marlowe"
-		#clientPort:  #portBase + 3
-		#serverPort:  #portBase + 4
-	}
-	"marlowe-website": jobDef.#MarloweWebsiteJob & {
-		if #namespace == "prod" {
-			#domain:      "marlowe-finance.io"
-		}
-		if #namespace != "prod" {
-			#domain:      "marlowe-website-\(#namespace).\(fqdn)"
+	if #variant == "plutus" {
+		"plutus-playground": jobDef.#PlutusPlaygroundJob & {
+			if #namespace == "plutus-apps-prod" {
+				#domain:      "playground.plutus.iohkdev.io"
+			}
+			if #namespace != "plutus-apps-prod" {
+				#domain:      "plutus-playground-\(#namespace).\(fqdn)"
+			}
+			#domainNS:    #namespace
+			#variant:     "plutus"
+			#clientPort:  #portBase + 1
+			#serverPort:  #portBase + 2
 		}
-		#port: #portBase + 5
 	}
-	"marlowe-run": jobDef.#MarloweRunJob & {
-		if #namespace == "prod" {
-			#domain:      "run.marlowe-finance.io"
+	if #variant == "marlowe" {
+		"marlowe-playground": jobDef.#PlutusPlaygroundJob & {
+			if #namespace == "prod" {
+				#domain:      "play.marlowe-finance.io"
+			}
+			if #namespace != "prod" {
+				#domain:      "marlowe-playground-\(#namespace).\(fqdn)"
+			}
+			#domainNS:    #namespace
+			#variant:     "marlowe"
+			#clientPort:  #portBase + 3
+			#serverPort:  #portBase + 4
+		}
+		"marlowe-website": jobDef.#MarloweWebsiteJob & {
+			if #namespace == "prod" {
+				#domain:      "marlowe-finance.io"
+			}
+			if #namespace != "prod" {
+				#domain:      "marlowe-website-\(#namespace).\(fqdn)"
+			}
+			#port: #portBase + 5
 		}
-		if #namespace != "prod" {
-			#domain:      "marlowe-run-\(#namespace).\(fqdn)"
+		"marlowe-run": jobDef.#MarloweRunJob & {
+			if #namespace == "prod" {
+				#domain:      "run.marlowe-finance.io"
+			}
+			if #namespace != "prod" {
+				#domain:      "marlowe-run-\(#namespace).\(fqdn)"
+			}
+			#portRangeBase:  #portBase + 6
 		}
-		#portRangeBase:  #portBase + 6
 	}
 }
 
@@ -99,41 +110,49 @@ Namespace: [Name=_]: {
 #namespaces: {
 	"production": {
 		vars: {
-			#plutusRev: revisions["production"]
+			#revs: revisions["production"]
+			#variant: "marlowe"
 		}
 		jobs: #jobs & {
 			#namespace: "prod"
 			#portBase: 1776
+			#variant: "marlowe"
 		}
 
 	}
 	"staging": {
 		vars: {
-			#plutusRev: revisions["staging"]
+			#revs: revisions["staging"]
+			#variant: "marlowe"
 		}
 		jobs: #jobs & {
 			#namespace: "staging"
 			#portBase: 1787
+			#variant: "marlowe"
 		}
-
 	}
+
 	"plutus-production": {
 		vars: {
-			#plutusRev: revisions["plutus-production"]
+			#revs: revisions["plutusProduction"]
+			#variant: "plutus"
 		}
 		jobs: #jobs & {
 			#namespace: "plutus-apps-prod"
 			#portBase: 1798
+			#variant: "plutus"
 		}
 
 	}
-	"wyohack": {
+	"plutus-staging": {
 		vars: {
-			#plutusRev: revisions["wyohack"]
+			#revs: revisions["plutusStaging"]
+			#variant: "plutus"
 		}
 		jobs: #jobs & {
-			#namespace: "wyohack"
+			#namespace: "plutus-apps-staging"
 			#portBase: 1809
+			#variant: "plutus"
 		}
 
 	}

diff --git a/revisions/combined.cue b/revisions/combined.cue
@@ -0,0 +1,13 @@
+package revisions
+
+import (
+	"github.com/input-output-hk/plutus-ops/pkg/revisions/production:production"
+	"github.com/input-output-hk/plutus-ops/pkg/revisions/staging:staging"
+	"github.com/input-output-hk/plutus-ops/pkg/revisions/plutusProduction:plutusProduction"
+	"github.com/input-output-hk/plutus-ops/pkg/revisions/plutusStaging:plutusStaging"
+)
+
+"production": production
+"staging": staging
+"plutusProduction": plutusProduction
+"plutusStaging": plutusStaging
diff --git a/revisions/plutus-production.cue b/revisions/plutus-production.cue
diff --git a/revisions/plutusProduction/plutus.cue b/revisions/plutusProduction/plutus.cue
@@ -0,0 +1,3 @@
+package plutusProduction
+
+plutus: "e2cd641501d13715120329092b3a93df35493a44"
diff --git a/revisions/plutusStaging/plutus.cue b/revisions/plutusStaging/plutus.cue
@@ -0,0 +1,3 @@
+package plutusStaging
+
+plutus: "942bd8c6de6a2d5981d91c704b0258bddd9d9d7c"
diff --git a/revisions/production.cue b/revisions/production.cue
diff --git a/revisions/production/marlowe.cue b/revisions/production/marlowe.cue
@@ -0,0 +1,3 @@
+package production
+
+marlowe: "fbc32408025494f62c9d99ccb3f099cf17efb6e2"
diff --git a/revisions/production/marloweWebsite.cue b/revisions/production/marloweWebsite.cue
@@ -0,0 +1,3 @@
+package production
+
+marloweWebsite: "fbc32408025494f62c9d99ccb3f099cf17efb6e2"
diff --git a/revisions/staging.cue b/revisions/staging.cue
diff --git a/revisions/staging/marlowe.cue b/revisions/staging/marlowe.cue
@@ -0,0 +1,3 @@
+package staging
+
+marlowe: "942bd8c6de6a2d5981d91c704b0258bddd9d9d7c"
diff --git a/revisions/staging/marloweWebsite.cue b/revisions/staging/marloweWebsite.cue
@@ -0,0 +1,3 @@
+package staging
+
+marloweWebsite: "942bd8c6de6a2d5981d91c704b0258bddd9d9d7c"
diff --git a/revisions/wyohack.cue b/revisions/wyohack.cue