Merge pull request #4 from bxy4543/fix/e2e_apply_multi_infra

fix multi e2e apply test with infra
bxy4543 · Jul 20, 2023 · 02ba476 · 02ba476
2 parents ed40683 + a22f5f0
commit 02ba476
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/e2e_test_apply.yml b/.github/workflows/e2e_test_apply.yml
@@ -19,6 +19,7 @@ jobs:
     permissions:
       issues: write
     strategy:
+      fail-fast: false
       matrix:
         arch: [ arm64, amd64 ]
     outputs:

diff --git a/test/e2e/suites/apply/apply.go b/test/e2e/suites/apply/apply.go
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/labring/sealos/test/e2e/suites/operators"
+
 	"github.com/labring/sealos/test/e2e/testhelper/utils"
 
 	"github.com/labring/sealos/pkg/types/v1beta1"
@@ -107,6 +109,16 @@ func (a *Applier) initImage() {
 		}
 		err = a.RemoteSealosCmd.ImageLoad(a.Infra.PatchImageTar)
 		utils.CheckErr(err)
+		images, err := operators.NewFakeImage(a.RemoteSealosCmd).ListImages(true)
+		utils.CheckErr(err)
+		for _, image := range images {
+			for i := range image.Names {
+				if strings.Contains(image.Names[i], "sealos-patch") {
+					a.Infra.PatchImageName = image.Names[i]
+					break
+				}
+			}
+		}
 	} else {
 		err = a.RemoteSealosCmd.ImagePull(&cmd2.PullOptions{
 			ImageRefs: []string{a.Infra.PatchImageName},

diff --git a/test/e2e/suites/operators/image.go b/test/e2e/suites/operators/image.go
@@ -17,7 +17,7 @@ type fakeImageClient struct {
 	*cmd.SealosCmd
 }
 
-func newFakeImage(sealosCmd *cmd.SealosCmd) FakeImageInterface {
+func NewFakeImage(sealosCmd *cmd.SealosCmd) FakeImageInterface {
 	return &fakeImageClient{
 		SealosCmd: sealosCmd,
 	}

diff --git a/test/e2e/suites/operators/operators.go b/test/e2e/suites/operators/operators.go
@@ -36,7 +36,7 @@ func NewFakeClient(clusterName string) *FakeClient {
 	}
 	localCmd := cmd.NewSealosCmd(settings.E2EConfig.SealosBinPath, &cmd.LocalCmd{})
 	return &FakeClient{
-		Image:        newFakeImage(localCmd),
+		Image:        NewFakeImage(localCmd),
 		CRI:          newCRIClient(localCmd),
 		Cluster:      newClusterClient(localCmd, clusterName),
 		Cert:         newCertClient(localCmd, clusterName),