Refresh list of s390x excluded images

- bump alpine-git version to the latest one to be able to use multi-arch image - remove some s390x e2e and examples tests from excluded list, the bug was fixed by tektoncd#3337 - add kubectl image replacement for s390x Signed-off-by: Yulia Gaponenko <yulia.gaponenko1@de.ibm.com>
barthy1 · Oct 12, 2020 · aa8bfc4 · aa8bfc4
1 parent 27c76d2
commit aa8bfc4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 34 deletions.
diff --git a/examples/v1beta1/taskruns/authenticating-git-commands.yaml b/examples/v1beta1/taskruns/authenticating-git-commands.yaml
@@ -62,7 +62,7 @@ spec:
       emptyDir: {}
     sidecars:
     - name: server
-      image: alpine/git:v2.24.3
+      image: alpine/git:v2.26.2
       securityContext:
         runAsUser: 0
       volumeMounts:
@@ -105,7 +105,7 @@ spec:
     - name: setup
       # This Step is only necessary as part of the test, it's not something you'll
       # ever need in a real-world scenario involving an external git repo.
-      image: alpine/git:v2.24.3
+      image: alpine/git:v2.26.2
       securityContext:
         runAsUser: 0
       volumeMounts:
@@ -124,7 +124,7 @@ spec:
           sleep 1
         done
     - name: git-clone-and-push
-      image: alpine/git:v2.24.3
+      image: alpine/git:v2.26.2
       securityContext:
         runAsUser: 0
       workingDir: /root

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

diff --git a/test/multiarch_utils.go b/test/multiarch_utils.go
@@ -36,6 +36,8 @@ const (
 	busyboxImage = iota
 	// Registry image
 	registryImage
+	//kubectl image
+	kubectlImage
 )
 
 func init() {
@@ -58,11 +60,13 @@ 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",
 		}
 	}
 	return map[int]string{
 		busyboxImage:  "busybox@sha256:895ab622e92e18d6b461d671081757af7dbaa3b00e3e28e12505af7817f73649",
 		registryImage: "registry",
+		kubectlImage:  "lachlanevenson/k8s-kubectl",
 	}
 }
 
@@ -84,8 +88,10 @@ func getImagesMappingRE() map[*regexp.Regexp][]byte {
 func imageNamesMapping() map[string]string {
 	if getTestArch() == "s390x" {
 		return map[string]string{
-			"registry": getTestImage(registryImage),
-			"node":     "node:alpine3.11",
+			"registry":                   getTestImage(registryImage),
+			"node":                       "node:alpine3.11",
+			"lachlanevenson/k8s-kubectl": getTestImage(kubectlImage),
+			"gcr.io/cloud-builders/git":  "alpine/git:latest",
 		}
 	}
 
@@ -108,43 +114,16 @@ func initExcludedTests() sets.String {
 			"TestExamples/v1beta1/pipelineruns/pipelinerun",
 			"TestExamples/v1beta1/taskruns/build-gcs-zip",
 			"TestExamples/v1alpha1/taskruns/build-gcs-zip",
-			"TestExamples/v1alpha1/taskruns/git-volume",
-			"TestExamples/v1beta1/taskruns/git-volume",
 			"TestExamples/v1beta1/taskruns/docker-creds",
 			"TestExamples/v1alpha1/taskruns/docker-creds",
-			"TestExamples/v1beta1/taskruns/steps-run-in-order",
-			"TestExamples/v1alpha1/taskruns/steps-run-in-order",
-			"TestExamples/v1beta1/taskruns/step-by-digest",
-			"TestExamples/v1alpha1/taskruns/step-by-digest",
 			"TestExamples/v1alpha1/taskruns/gcs-resource",
 			"TestExamples/v1beta1/taskruns/gcs-resource",
 			"TestExamples/v1beta1/taskruns/authenticating-git-commands",
 			"TestExamples/v1beta1/pipelineruns/pipelinerun-with-final-tasks",
-			"TestExamples/v1beta1/taskruns/pullrequest_input_copystep_output",
-			"TestExamples/v1alpha1/taskruns/pullrequest_input_copystep_output",
-			"TestExamples/v1beta1/taskruns/pullrequest",
-			"TestExamples/v1alpha1/taskruns/pullrequest",
-			"TestExamples/v1beta1/pipelineruns/conditional-pipelinerun",
-			"TestExamples/v1alpha1/pipelineruns/pipelinerun-with-resourcespec",
-			"TestExamples/v1beta1/pipelineruns/pipelinerun-with-resourcespec",
-			"TestExamples/v1beta1/taskruns/git-ssh-creds-without-known_hosts",
-			"TestExamples/v1alpha1/taskruns/optional-resources",
-			"TestExamples/v1beta1/taskruns/optional-resources",
-			"TestExamples/v1beta1/taskruns/task-output-image",
+			"TestExamples/v1beta1/taskruns/workspace-in-sidecar",
 			//e2e
-			"TestEntrypointRunningStepsInOrder",
-			"TestWorkingDirIgnoredNonSlashWorkspace",
-			"TestTaskRun_EmbeddedResource",
-			"TestTaskRunPipelineRunCancel",
-			"TestEntrypointRunningStepsInOrder",
-			"TestGitPipelineRun",
 			"TestHelmDeployPipelineRun",
 			"TestKanikoTaskRun",
-			"TestPipelineRun",
-			"TestSidecarTaskSupport",
-			"TestWorstkingDirCreated",
-			"TestWorkingDirIgnoredNonSlashWorkspace",
-			"TestWorkingDirCreated",
 			"TestPipelineRun/service_account_propagation_and_pipeline_param",
 			"TestPipelineRun/pipelinerun_succeeds_with_LimitRange_minimum_in_namespace",
 		)