chore: address PR comments

contrib/images/Makefile

@@ -1,5 +1,6 @@
 RELAYER_TAG := $(shell grep '^ENV RELAYER_TAG' cosmos-relayer/Dockerfile | cut -f3 -d\ )
 BABYLON_FULL_PATH := $(shell git rev-parse --show-toplevel)
+BABYLON_VERSION_BEFORE_UPGRADE ?= a33a3344bb44bde2f3374d3cbf919abb942c341a
 
 all: babylond cosmos-relayer
 
@@ -9,7 +10,7 @@ babylond: babylond-rmi
 babylond-before-upgrade:
 	docker rmi babylonchain/babylond-before-upgrade 2>/dev/null; true && \
 	docker build --tag babylonchain/babylond-before-upgrade -f babylond/Dockerfile \
-    --build-arg VERSION="a33a3344bb44bde2f3374d3cbf919abb942c341a" ${BABYLON_FULL_PATH}
+    --build-arg VERSION="${BABYLON_VERSION_BEFORE_UPGRADE}" ${BABYLON_FULL_PATH}
 
 babylond-rmi:
 	docker rmi babylonchain/babylond 2>/dev/null; true

contrib/images/babylond/Dockerfile

@@ -1,9 +1,5 @@
 FROM golang:1.21 AS build-env
 
-# Customize to your build env
-
-# TARGETPLATFORM should be one of linux/amd64 or linux/arm64.
-ARG TARGETPLATFORM="linux/amd64"
 # Version to build. Default is empty
 ARG VERSION
 

test/e2e/software_upgrade_e2e_test.go

@@ -39,9 +39,11 @@ func (s *SoftwareUpgradeVanillaTestSuite) TestUpgradeVanilla() {
 	n, err := chainA.GetDefaultNode()
 	s.NoError(err)
 
-	// makes sure that the upgrade was acutally executed
+	expectedUpgradeHeight := int64(25)
+
+	// makes sure that the upgrade was actually executed
 	resp := n.QueryAppliedPlan("vanilla")
-	s.EqualValues(int64(25), resp.Height, "the plan should be applied at the height 25")
+	s.EqualValues(expectedUpgradeHeight, resp.Height, "the plan should be applied at the height 25")
 
 	fps := n.QueryFinalityProviders()
 	s.Len(fps, 1, "it should have one finality provider, since the vanilla upgrade just added a new one")