From 1954f3a949249643edb274c170cec1f34fffb0ac Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Tue, 19 Jul 2022 10:38:34 +0100
Subject: [PATCH] chore: adding environment variable to specify go relayer
 image

---
 .github/workflows/e2e-fork.yml |  3 +++
 .github/workflows/e2e.yaml     |  2 ++
 e2e/testconfig/testconfig.go   | 10 ++++++++++
 e2e/testsuite/relayer.go       |  6 ++++--
 e2e/testsuite/testsuite.go     |  2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e-fork.yml b/.github/workflows/e2e-fork.yml
index c7add63f323..b3d8aa9b32b 100644
--- a/.github/workflows/e2e-fork.yml
+++ b/.github/workflows/e2e-fork.yml
@@ -40,6 +40,9 @@ jobs:
         with:
           go-version: 1.18
       - name: Run e2e Test
+        env:
+          # see images here https://github.com/cosmos/relayer/pkgs/container/relayer/versions
+          RLY_TAG: "v2.0.0-rc2"
         run: |
           cd e2e
           make e2e-test suite=${{ matrix.suite }} test=${{ matrix.test }}
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 787559f18f3..12f52ef098e 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -82,6 +82,8 @@ jobs:
     env:
       SIMD_TAG: ${{ needs.determine-image-tag.outputs.simd-tag }}
       SIMD_IMAGE: ghcr.io/cosmos/ibc-go-simd-e2e
+      # see images here https://github.com/cosmos/relayer/pkgs/container/relayer/versions
+      RLY_TAG: "v2.0.0-rc2"
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.build-test-matrix.outputs.matrix) }}
diff --git a/e2e/testconfig/testconfig.go b/e2e/testconfig/testconfig.go
index c043712b4e4..50d49edce53 100644
--- a/e2e/testconfig/testconfig.go
+++ b/e2e/testconfig/testconfig.go
@@ -11,12 +11,16 @@ const (
 	DefaultSimdImage = "ghcr.io/cosmos/ibc-go-simd-e2e"
 	SimdImageEnv     = "SIMD_IMAGE"
 	SimdTagEnv       = "SIMD_TAG"
+	GoRelayerTag     = "RLY_TAG"
+
+	defaultRlyTag = "main"
 )
 
 // TestConfig holds various fields used in the E2E tests.
 type TestConfig struct {
 	SimdImage string
 	SimdTag   string
+	RlyTag    string
 }
 
 // FromEnv returns a TestConfig constructed from environment variables.
@@ -31,9 +35,15 @@ func FromEnv() TestConfig {
 		panic(fmt.Sprintf("must specify simd version for test with environment variable [%s]", SimdTagEnv))
 	}
 
+	rlyTag, ok := os.LookupEnv(GoRelayerTag)
+	if !ok {
+		rlyTag = defaultRlyTag
+	}
+
 	return TestConfig{
 		SimdImage: simdImage,
 		SimdTag:   simdTag,
+		RlyTag:    rlyTag,
 	}
 }
 
diff --git a/e2e/testsuite/relayer.go b/e2e/testsuite/relayer.go
index f71ef586ed9..123a54465d1 100644
--- a/e2e/testsuite/relayer.go
+++ b/e2e/testsuite/relayer.go
@@ -3,6 +3,8 @@ package testsuite
 import (
 	"testing"
 
+	"e2e/testconfig"
+
 	dockerclient "github.com/docker/docker/client"
 	"github.com/strangelove-ventures/ibctest"
 	"github.com/strangelove-ventures/ibctest/ibc"
@@ -15,8 +17,8 @@ const (
 )
 
 // newCosmosRelayer returns an instance of the go relayer.
-func newCosmosRelayer(t *testing.T, logger *zap.Logger, dockerClient *dockerclient.Client, network string) ibc.Relayer {
-	return ibctest.NewBuiltinRelayerFactory(ibc.CosmosRly, logger, relayer.CustomDockerImage(cosmosRelayerRepository, "main")).Build(
+func newCosmosRelayer(t *testing.T, tc testconfig.TestConfig, logger *zap.Logger, dockerClient *dockerclient.Client, network string) ibc.Relayer {
+	return ibctest.NewBuiltinRelayerFactory(ibc.CosmosRly, logger, relayer.CustomDockerImage(cosmosRelayerRepository, tc.RlyTag)).Build(
 		t, dockerClient, network,
 	)
 }
diff --git a/e2e/testsuite/testsuite.go b/e2e/testsuite/testsuite.go
index 76307590d9e..d8b5387b305 100644
--- a/e2e/testsuite/testsuite.go
+++ b/e2e/testsuite/testsuite.go
@@ -74,7 +74,7 @@ func (s *E2ETestSuite) SetupChainsRelayerAndChannel(ctx context.Context, channel
 	home, err := ioutil.TempDir("", "")
 	s.Require().NoError(err)
 
-	r := newCosmosRelayer(s.T(), s.logger, s.DockerClient, s.network)
+	r := newCosmosRelayer(s.T(), testconfig.FromEnv(), s.logger, s.DockerClient, s.network)
 
 	pathName := fmt.Sprintf("%s-path", s.T().Name())
 	pathName = strings.ReplaceAll(pathName, "/", "-")