Skip to content

Commit fb3aedf

Browse files
committed
Adding power (ppc64le) architecture image mappings
1 parent 2ba62c8 commit fb3aedf

File tree

1 file changed

+51
-10
lines changed

1 file changed

+51
-10
lines changed

test/multiarch_utils.go

+51-10
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,31 @@ func getTestArch() string {
6060

6161
// initImageNames returns the map with arch dependent image names for e2e tests
6262
func initImageNames() map[int]string {
63-
if getTestArch() == "s390x" {
63+
switch getTestArch() {
64+
case "s390x":
6465
return map[int]string{
6566
busyboxImage: "busybox@sha256:4f47c01fa91355af2865ac10fef5bf6ec9c7f42ad2321377c21e844427972977",
6667
registryImage: "ibmcom/registry:2.6.2.5",
6768
kubectlImage: "ibmcom/kubectl:v1.13.9",
6869
helmImage: "ibmcom/alpine-helm-s390x:latest",
6970
kanikoImage: "gcr.io/kaniko-project/executor:s390x-9ed158c1f63a059cde4fd5f8b95af51d452d9aa7",
7071
}
71-
}
72-
return map[int]string{
73-
busyboxImage: "busybox@sha256:895ab622e92e18d6b461d671081757af7dbaa3b00e3e28e12505af7817f73649",
74-
registryImage: "registry",
75-
kubectlImage: "lachlanevenson/k8s-kubectl",
76-
helmImage: "alpine/helm:3.1.2",
77-
kanikoImage: "gcr.io/kaniko-project/executor:v1.3.0",
72+
case "ppc64le":
73+
return map[int]string{
74+
busyboxImage: "busybox@sha256:4f47c01fa91355af2865ac10fef5bf6ec9c7f42ad2321377c21e844427972977",
75+
registryImage: "ibmcom/registry:2.6.2.5",
76+
kubectlImage: "ibmcom/kubectl:v1.13.9",
77+
helmImage: "ibmcom/helm-ppc64le:latest",
78+
kanikoImage: "ibmcom/kaniko-project-executor-ppc64le:v0.17.1",
79+
}
80+
default:
81+
return map[int]string{
82+
busyboxImage: "busybox@sha256:895ab622e92e18d6b461d671081757af7dbaa3b00e3e28e12505af7817f73649",
83+
registryImage: "registry",
84+
kubectlImage: "lachlanevenson/k8s-kubectl",
85+
helmImage: "alpine/helm:3.1.2",
86+
kanikoImage: "gcr.io/kaniko-project/executor:v1.3.0",
87+
}
7888
}
7989
}
8090

@@ -94,7 +104,9 @@ func getImagesMappingRE() map[*regexp.Regexp][]byte {
94104
// imageNamesMapping provides mapping between image name in the examples yaml files and desired image name for specific arch.
95105
// by default empty map is returned.
96106
func imageNamesMapping() map[string]string {
97-
if getTestArch() == "s390x" {
107+
108+
switch getTestArch() {
109+
case "s390x":
98110
return map[string]string{
99111
"registry": getTestImage(registryImage),
100112
"node": "node:alpine3.11",
@@ -106,14 +118,42 @@ func imageNamesMapping() map[string]string {
106118
"stedolan/jq": "ibmcom/jq-s390x:latest",
107119
"gcr.io/kaniko-project/executor:v1.3.0": getTestImage(kanikoImage),
108120
}
121+
case "ppc64le":
122+
return map[string]string{
123+
"registry": getTestImage(registryImage),
124+
"node": "node:alpine3.11",
125+
"lachlanevenson/k8s-kubectl": getTestImage(kubectlImage),
126+
"gcr.io/cloud-builders/git": "alpine/git:latest",
127+
"docker:dind": "docker:18.06.2-dind",
128+
"docker": "docker:18.06.3",
129+
"mikefarah/yq": "danielxlee/yq:2.4.0",
130+
"stedolan/jq": "ibmcom/jq-ppc64le:latest",
131+
"gcr.io/kaniko-project/executor:v1.3.0": getTestImage(kanikoImage),
132+
}
133+
109134
}
110135

111136
return make(map[string]string)
112137
}
113138

114139
// initExcludedTests provides list of excluded tests for e2e and exanples tests
115140
func initExcludedTests() sets.String {
116-
if getTestArch() == "s390x" {
141+
142+
switch getTestArch() {
143+
case "s390x":
144+
return sets.NewString(
145+
//examples
146+
"TestExamples/v1alpha1/taskruns/build-gcs-targz",
147+
"TestExamples/v1beta1/taskruns/build-gcs-targz",
148+
"TestExamples/v1beta1/taskruns/build-gcs-zip",
149+
"TestExamples/v1alpha1/taskruns/build-gcs-zip",
150+
"TestExamples/v1alpha1/taskruns/gcs-resource",
151+
"TestExamples/v1beta1/taskruns/gcs-resource",
152+
"TestExamples/v1beta1/pipelineruns/pipelinerun",
153+
//e2e
154+
"TestHelmDeployPipelineRun",
155+
)
156+
case "ppc64le":
117157
return sets.NewString(
118158
//examples
119159
"TestExamples/v1alpha1/taskruns/build-gcs-targz",
@@ -127,6 +167,7 @@ func initExcludedTests() sets.String {
127167
"TestHelmDeployPipelineRun",
128168
)
129169
}
170+
130171
return sets.NewString()
131172
}
132173

0 commit comments

Comments
 (0)