Change image name in e2e tests

Signed-off-by: Alexandr Demicev <[email protected]>
rancher · Sep 13, 2024 · c4d9f22 · c4d9f22
1 parent 5e6feae
commit c4d9f22
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 31 deletions.
diff --git a/.github/workflows/release_sign/action.yaml b/.github/workflows/release_sign/action.yaml
@@ -44,15 +44,10 @@ runs:
         username: ${{ inputs.username }}
         password: ${{ inputs.password }}
     - uses: sigstore/[email protected]
-    - name: Sign manifests
+    - name: Sign and verify manifests
       shell: bash
       env:
         COSIGN_EXPERIMENTAL: 1
       run: |
         cosign sign --yes ${{ inputs.image }}@${{ inputs.digest }} --oidc-provider=${{ inputs.oidc-provider }} --recursive
-    - name: Verify pushed ghcr images
-      shell: bash
-      env:
-        COSIGN_EXPERIMENTAL: 1
-      run: |
         cosign verify ${{ inputs.image }}@${{ inputs.digest }} --certificate-identity=${{ inputs.identity }} --certificate-oidc-issuer=${{ inputs.oids-issuer }}
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -24,11 +24,11 @@ jobs:
         uses: actions/[email protected]
       - name: Build an image
         run: |
-          TAG=${{ github.sha }} ARCH=amd64 make docker-build
+          TAG=${{ github.sha }} make docker-build
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@062f2592684a31eb3aa050cc61e7ca1451cecd3d
         with:
-          image-ref: 'ghcr.io/rancher/turtles-amd64:${{ github.sha }}'
+          image-ref: 'ghcr.io/rancher/turtles:${{ github.sha }}'
           format: 'sarif'
           output: 'trivy-results.sarif'
           severity: 'CRITICAL,HIGH'

diff --git a/Makefile b/Makefile
@@ -159,8 +159,7 @@ NOTES := $(abspath $(TOOLS_BIN_DIR)/$(NOTES_BIN))
 
 # Registry / images
 TAG ?= dev
-ARCH ?= $(shell go env GOARCH)
-ALL_ARCH = amd64 arm64
+ARCH ?= linux/$(shell go env GOARCH)
 TARGET_PLATFORMS := linux/amd64,linux/arm64
 MACHINE := rancher-turtles
 REGISTRY ?= ghcr.io

diff --git a/test/e2e/config/operator.yaml b/test/e2e/config/operator.yaml
@@ -2,7 +2,7 @@ managementClusterName: rancher-turtles-e2e
 
 images:
 # Use local dev images built source tree;
-- name: ghcr.io/rancher/turtles-e2e-{ARCH}:v0.0.1 # This should be substituted with operator image
+- name: ghcr.io/rancher/turtles-e2e:v0.0.1 # This should be substituted with operator image
   loadBehavior: tryLoad
 
 intervals:

diff --git a/test/e2e/specs/migrate_gitops_provv1_mgmtv3.go b/test/e2e/specs/migrate_gitops_provv1_mgmtv3.go
@@ -25,7 +25,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"time"
 
@@ -362,7 +361,7 @@ func MigrateToV3UsingGitOpsSpec(ctx context.Context, inputGetter func() MigrateT
 			BootstrapClusterProxy:        input.BootstrapClusterProxy,
 			HelmBinaryPath:               input.HelmBinaryPath,
 			Namespace:                    turtlesframework.DefaultRancherTurtlesNamespace,
-			Image:                        fmt.Sprintf("ghcr.io/rancher/turtles-e2e-%s", runtime.GOARCH),
+			Image:                        "ghcr.io/rancher/turtles-e2e",
 			Tag:                          input.E2EConfig.GetVariable(e2e.TurtlesVersionVar),
 			WaitDeploymentsReadyInterval: input.E2EConfig.GetIntervals(input.BootstrapClusterProxy.GetName(), "wait-controllers"),
 			SkipCleanup:                  true,

diff --git a/test/e2e/suites/chart-upgrade/chart_upgrade_test.go b/test/e2e/suites/chart-upgrade/chart_upgrade_test.go
@@ -21,8 +21,6 @@ package chart_upgrade
 
 import (
 	_ "embed"
-	"fmt"
-	"runtime"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -77,7 +75,7 @@ var _ = Describe("Chart upgrade functionality should work", Label(e2e.ShortTestL
 			BootstrapClusterProxy:        setupClusterResult.BootstrapClusterProxy,
 			HelmBinaryPath:               e2eConfig.GetVariable(e2e.HelmBinaryPathVar),
 			Namespace:                    framework.DefaultRancherTurtlesNamespace,
-			Image:                        fmt.Sprintf("ghcr.io/rancher/turtles-e2e-%s", runtime.GOARCH),
+			Image:                        "ghcr.io/rancher/turtles-e2e",
 			Tag:                          e2eConfig.GetVariable(e2e.TurtlesVersionVar),
 			WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),
 			AdditionalValues:             rtInput.AdditionalValues,

diff --git a/test/e2e/suites/embedded-capi-disabled-v3/suite_test.go b/test/e2e/suites/embedded-capi-disabled-v3/suite_test.go
@@ -23,7 +23,6 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"testing"
 
@@ -161,7 +160,7 @@ var _ = BeforeSuite(func() {
 		TurtlesChartPath:             e2eConfig.GetVariable(e2e.TurtlesPathVar),
 		CAPIProvidersYAML:            e2e.CapiProviders,
 		Namespace:                    framework.DefaultRancherTurtlesNamespace,
-		Image:                        fmt.Sprintf("ghcr.io/rancher/turtles-e2e-%s", runtime.GOARCH),
+		Image:                        "ghcr.io/rancher/turtles-e2e",
 		Tag:                          e2eConfig.GetVariable(e2e.TurtlesVersionVar),
 		WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),
 		AdditionalValues: map[string]string{

diff --git a/test/e2e/suites/embedded-capi-disabled/suite_test.go b/test/e2e/suites/embedded-capi-disabled/suite_test.go
@@ -23,7 +23,6 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"testing"
 
@@ -162,7 +161,7 @@ var _ = BeforeSuite(func() {
 		TurtlesChartPath:             e2eConfig.GetVariable(e2e.TurtlesPathVar),
 		CAPIProvidersYAML:            e2e.CapiProviders,
 		Namespace:                    framework.DefaultRancherTurtlesNamespace,
-		Image:                        fmt.Sprintf("ghcr.io/rancher/turtles-e2e-%s", runtime.GOARCH),
+		Image:                        "ghcr.io/rancher/turtles-e2e",
 		Tag:                          e2eConfig.GetVariable(e2e.TurtlesVersionVar),
 		WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),
 		AdditionalValues: map[string]string{

diff --git a/test/e2e/suites/import-gitops-v3/suite_test.go b/test/e2e/suites/import-gitops-v3/suite_test.go
@@ -23,7 +23,6 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"testing"
 
@@ -162,7 +161,7 @@ var _ = BeforeSuite(func() {
 		TurtlesChartPath:             e2eConfig.GetVariable(e2e.TurtlesPathVar),
 		CAPIProvidersYAML:            e2e.CapiProviders,
 		Namespace:                    framework.DefaultRancherTurtlesNamespace,
-		Image:                        fmt.Sprintf("ghcr.io/rancher/turtles-e2e-%s", runtime.GOARCH),
+		Image:                        "ghcr.io/rancher/turtles-e2e",
 		Tag:                          e2eConfig.GetVariable(e2e.TurtlesVersionVar),
 		WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),
 		AdditionalValues: map[string]string{

diff --git a/test/e2e/suites/import-gitops/suite_test.go b/test/e2e/suites/import-gitops/suite_test.go
@@ -23,7 +23,6 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"testing"
 
@@ -170,7 +169,7 @@ var _ = BeforeSuite(func() {
 			TurtlesChartPath:             e2eConfig.GetVariable(e2e.TurtlesPathVar),
 			CAPIProvidersYAML:            e2e.CapiProviders,
 			Namespace:                    framework.DefaultRancherTurtlesNamespace,
-			Image:                        fmt.Sprintf("ghcr.io/rancher/turtles-e2e-%s", runtime.GOARCH),
+			Image:                        "ghcr.io/rancher/turtles-e2e",
 			Tag:                          e2eConfig.GetVariable(e2e.TurtlesVersionVar),
 			WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),
 			AdditionalValues:             map[string]string{},
@@ -201,7 +200,7 @@ var _ = BeforeSuite(func() {
 			TurtlesChartPath:             e2eConfig.GetVariable(e2e.TurtlesPathVar),
 			CAPIProvidersYAML:            e2e.CapiProviders,
 			Namespace:                    framework.DefaultRancherTurtlesNamespace,
-			Image:                        fmt.Sprintf("ghcr.io/rancher/turtles-e2e-%s", runtime.GOARCH),
+			Image:                        "ghcr.io/rancher/turtles-e2e",
 			Tag:                          e2eConfig.GetVariable(e2e.TurtlesVersionVar),
 			WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),
 			AdditionalValues:             map[string]string{},

diff --git a/test/e2e/suites/migrate-gitops/suite_test.go b/test/e2e/suites/migrate-gitops/suite_test.go
@@ -23,7 +23,6 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"testing"
 
@@ -171,7 +170,7 @@ var _ = BeforeSuite(func() {
 		TurtlesChartPath:             e2eConfig.GetVariable(e2e.TurtlesPathVar),
 		CAPIProvidersYAML:            e2e.CapiProviders,
 		Namespace:                    framework.DefaultRancherTurtlesNamespace,
-		Image:                        fmt.Sprintf("ghcr.io/rancher/turtles-e2e-%s", runtime.GOARCH),
+		Image:                        "ghcr.io/rancher/turtles-e2e",
 		Tag:                          e2eConfig.GetVariable(e2e.TurtlesVersionVar),
 		WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),
 		AdditionalValues:             map[string]string{},

diff --git a/test/e2e/suites/update-labels/suite_test.go b/test/e2e/suites/update-labels/suite_test.go
@@ -23,7 +23,6 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"testing"
 
@@ -158,7 +157,7 @@ var _ = BeforeSuite(func() {
 		TurtlesChartPath:             e2eConfig.GetVariable(e2e.TurtlesPathVar),
 		CAPIProvidersYAML:            e2e.CapiProviders,
 		Namespace:                    framework.DefaultRancherTurtlesNamespace,
-		Image:                        fmt.Sprintf("ghcr.io/rancher/turtles-e2e-%s", runtime.GOARCH),
+		Image:                        "ghcr.io/rancher/turtles-e2e",
 		Tag:                          e2eConfig.GetVariable(e2e.TurtlesVersionVar),
 		WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),
 		AdditionalValues: map[string]string{

diff --git a/test/e2e/suites/v2prov/suite_test.go b/test/e2e/suites/v2prov/suite_test.go
@@ -23,7 +23,6 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"testing"
 
@@ -160,7 +159,7 @@ var _ = BeforeSuite(func() {
 		TurtlesChartPath:             e2eConfig.GetVariable(e2e.TurtlesPathVar),
 		CAPIProvidersYAML:            e2e.CapiProviders,
 		Namespace:                    turtlesframework.DefaultRancherTurtlesNamespace,
-		Image:                        fmt.Sprintf("ghcr.io/rancher/turtles-e2e-%s", runtime.GOARCH),
+		Image:                        "ghcr.io/rancher/turtles-e2e",
 		Tag:                          e2eConfig.GetVariable(e2e.TurtlesVersionVar),
 		WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),
 		AdditionalValues:             map[string]string{},