chore(e2e): add solver pin to manifest (#3065)

Allow pinning solver tag in manifest. issue: none
omni-network · Feb 13, 2025 · 907a9b1 · 907a9b1
1 parent 4cecbf8
commit 907a9b1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/e2e/docker/docker.go b/e2e/docker/docker.go
@@ -285,10 +285,15 @@ func SetImageTags(def ComposeDef, manifest types.Manifest, omniImgTag string) Co
 		relayerTag = manifest.PinnedRelayerTag
 	}
 
+	solverTag := omniImgTag
+	if manifest.PinnedSolverTag != "" {
+		solverTag = manifest.PinnedSolverTag
+	}
+
 	def.AnvilProxyTag = anvilProxyTag
 	def.MonitorTag = monitorTag
 	def.RelayerTag = relayerTag
-	def.SolverTag = omniImgTag
+	def.SolverTag = solverTag
 
 	return def
 }

diff --git a/e2e/docker/docker_test.go b/e2e/docker/docker_test.go
@@ -61,6 +61,7 @@ func TestComposeTemplate(t *testing.T) {
 				Manifest: types.Manifest{
 					PinnedRelayerTag: "v2",
 					PinnedMonitorTag: "v3",
+					PinnedSolverTag:  "v4",
 				},
 				Testnet: &e2e.Testnet{
 					Name:       "test",

diff --git a/e2e/docker/testdata/TestComposeTemplate_commit.golden b/e2e/docker/testdata/TestComposeTemplate_commit.golden
@@ -148,7 +148,7 @@ services:
     labels:
       e2e: true
     container_name: solver
-    image: omniops/solver:7d1ae53
+    image: omniops/solver:v4
     restart: unless-stopped
     ports:
       - 26660 # Prometheus and pprof

diff --git a/e2e/docker/testdata/TestComposeTemplate_empheral_network.golden b/e2e/docker/testdata/TestComposeTemplate_empheral_network.golden
@@ -148,7 +148,7 @@ services:
     labels:
       e2e: true
     container_name: solver
-    image: omniops/solver:main
+    image: omniops/solver:v4
     restart: unless-stopped
     ports:
       - 26660 # Prometheus and pprof

diff --git a/e2e/docker/testdata/TestComposeTemplate_empheral_network_upgrade.golden b/e2e/docker/testdata/TestComposeTemplate_empheral_network_upgrade.golden
@@ -148,7 +148,7 @@ services:
     labels:
       e2e: true
     container_name: solver
-    image: omniops/solver:main
+    image: omniops/solver:v4
     restart: unless-stopped
     ports:
       - 26660 # Prometheus and pprof

diff --git a/e2e/types/manifest.go b/e2e/types/manifest.go
@@ -121,6 +121,11 @@ type Manifest struct {
 	// This overrides the --omni-image-tag if non-empty.
 	PinnedRelayerTag string `toml:"pinned_relayer_tag"`
 
+	// PinnedSolverTag defines the pinned solver docker image tag.
+	// This allows source code defined versions for protected networks.
+	// This overrides the --omni-image-tag if non-empty.
+	PinnedSolverTag string `toml:"pinned_solver_tag"`
+
 	// EphemeralGenesis defines halovisor binary (network upgrade) to use from genesis onwards.
 	// The next network upgrade will be planned at height=1.
 	// This is only applicable to ephemeral networks.