From 795a8c2a4a9710492ff981502965f2489243dc3c Mon Sep 17 00:00:00 2001
From: aljo242 <alex@shmeeload.xyz>
Date: Wed, 14 Jun 2023 14:19:03 -0400
Subject: [PATCH 1/2] update Makefile

---
 Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 715f4834f..419dd062c 100755
--- a/Makefile
+++ b/Makefile
@@ -352,18 +352,18 @@ vet:
 ###############################################################################
 
 # Executes basic chain tests via interchaintest
-ictest-basic: 
+ictest-basic: ictest-deps
 	@cd test/interchaintest && go test -v -run TestBasicQuicksilverStart .
 
 # Executes a basic chain upgrade test via interchaintest
-ictest-upgrade: 
+ictest-upgrade: ictest-deps
 	@cd test/interchaintest && go test -v -run TestBasicQuicksilverUpgrade .
 
 # Executes a basic chain upgrade locally via interchaintest after compiling a local image as quicksilver:local
-ictest-upgrade-local: local-image ictest-upgrade
+ictest-upgrade-local: local-image ictest-deps ictest-upgrade
 
 # Executes IBC Transfer tests via interchaintest
-ictest-ibc: 
+ictest-ibc: ictest-deps
 	@cd test/interchaintest && go test -v -run TestQuicksilverJunoIBCTransfer .
 
 # Executes TestInterchainStaking tests via interchaintest
@@ -371,7 +371,9 @@ ictest-interchainstaking: ictest-deps
 	@cd test/interchaintest && go test -v -run TestInterchainStaking .
 
 # Executes all tests via interchaintest after compiling a local image as quicksilver:local
-ictest-all: ictest-build ictest-basic ictest-upgrade ictest-ibc ictest-interchainstaking
+ictest-all: ictest-setup ictest-basic ictest-upgrade ictest-ibc ictest-interchainstaking
+
+ictest-setup: ictest-build ictest-deps
 
 ictest-build: get-heighliner local-image
 
@@ -383,7 +385,6 @@ ictest-deps:
 ictest-build-push: ictest-setup
 	@$(DOCKER) tag quicksilver:local  quicksilverzone/quicksilver-e2e:latest
 	@$(DOCKER) push quicksilverzone/quicksilver-e2e:latest
-
 .PHONY: ictest-basic ictest-upgrade ictest-ibc ictest-all ictest-deps ictest-build ictest-build-push
 
 ###############################################################################

From 204b0f30521183f3335f586e40f4dfaae94fe0f9 Mon Sep 17 00:00:00 2001
From: aljo242 <alex@shmeeload.xyz>
Date: Wed, 14 Jun 2023 14:19:17 -0400
Subject: [PATCH 2/2] update workflow

---
 .github/workflows/interchaintest.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/interchaintest.yaml b/.github/workflows/interchaintest.yaml
index a99dfb9db..3664518f5 100644
--- a/.github/workflows/interchaintest.yaml
+++ b/.github/workflows/interchaintest.yaml
@@ -67,7 +67,7 @@ jobs:
 
       - run: make ictest-basic
         env:
-          BRANCH_CI: ${{needs.build-and-push-image.outputs.branchTag}}
+          BRANCH_CI: "latest"
 
   test-quicksilver-ibc:
     runs-on: ubuntu-latest
@@ -84,7 +84,7 @@ jobs:
 
       - run: make ictest-ibc
         env:
-          BRANCH_CI: ${{needs.build-and-push-image.outputs.branchTag}}
+          BRANCH_CI: "latest"
 
   test-quicksilver-interchainstaking:
     runs-on: ubuntu-latest
@@ -101,4 +101,4 @@ jobs:
 
       - run: make ictest-interchainstaking
         env:
-          BRANCH_CI: ${{needs.build-and-push-image.outputs.branchTag}}
+          BRANCH_CI: "latest"