Cleanup multi-arch tests

Use common lachlanevenson/k8s-kubectl image instead of different ones for amd64 and s390x/ppc64le architectures Signed-off-by: Yulia Gaponenko <yulia.gaponenko1@de.ibm.com>
tektoncd · Jul 12, 2021 · 95812cc · 95812cc
1 parent 7e4189d
commit 95812cc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/test/helm_task_test.go b/test/helm_task_test.go
@@ -183,7 +183,7 @@ func getHelmDeployTask(namespace, helmDeployTaskName string) *v1beta1.Task {
 					"service.type=ClusterIP",
 				},
 			}}, {Container: corev1.Container{
-				Image:   getTestImage(kubectlImage),
+				Image:   "lachlanevenson/k8s-kubectl",
 				Command: []string{"kubectl"},
 				Args: []string{
 					"get",

diff --git a/test/multiarch_utils.go b/test/multiarch_utils.go
@@ -37,8 +37,6 @@ const (
 	// Registry image
 	registryImage
 	// kubectl image
-	kubectlImage
-	// kaniko executor image
 	kanikoImage
 	// dockerize image
 	dockerizeImage
@@ -65,23 +63,20 @@ func initImageNames() map[int]string {
 		return map[int]string{
 			busyboxImage:   "busybox@sha256:4f47c01fa91355af2865ac10fef5bf6ec9c7f42ad2321377c21e844427972977",
 			registryImage:  "ibmcom/registry:2.6.2.5",
-			kubectlImage:   "ibmcom/kubectl:v1.13.9",
 			kanikoImage:    "gcr.io/kaniko-project/executor:s390x-9ed158c1f63a059cde4fd5f8b95af51d452d9aa7",
 			dockerizeImage: "ibmcom/dockerize-s390x",
 		}
 	case "ppc64le":
 		return map[int]string{
 			busyboxImage:   "busybox@sha256:4f47c01fa91355af2865ac10fef5bf6ec9c7f42ad2321377c21e844427972977",
 			registryImage:  "ppc64le/registry:2",
-			kubectlImage:   "ibmcom/kubectl:v1.13.9",
 			kanikoImage:    "ibmcom/kaniko-project-executor-ppc64le:v0.17.1",
 			dockerizeImage: "ibmcom/dockerize-ppc64le",
 		}
 	default:
 		return map[int]string{
 			busyboxImage:   "busybox@sha256:895ab622e92e18d6b461d671081757af7dbaa3b00e3e28e12505af7817f73649",
 			registryImage:  "registry",
-			kubectlImage:   "lachlanevenson/k8s-kubectl",
 			kanikoImage:    "gcr.io/kaniko-project/executor:v1.3.0",
 			dockerizeImage: "jwilder/dockerize",
 		}
@@ -111,7 +106,6 @@ func imageNamesMapping() map[string]string {
 		return map[string]string{
 			"registry":                              getTestImage(registryImage),
 			"node":                                  "node:alpine3.11",
-			"lachlanevenson/k8s-kubectl":            getTestImage(kubectlImage),
 			"gcr.io/cloud-builders/git":             "alpine/git:latest",
 			"docker:dind":                           "ibmcom/docker-s390x:dind",
 			"docker":                                "docker:18.06.3",
@@ -123,7 +117,6 @@ func imageNamesMapping() map[string]string {
 		return map[string]string{
 			"registry":                              getTestImage(registryImage),
 			"node":                                  "node:alpine3.11",
-			"lachlanevenson/k8s-kubectl":            getTestImage(kubectlImage),
 			"gcr.io/cloud-builders/git":             "alpine/git:latest",
 			"docker:dind":                           "ibmcom/docker-ppc64le:19.03-dind",
 			"docker":                                "docker:18.06.3",