Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup integraton tests for multi-arch case #3998

Merged
merged 1 commit into from
Jun 2, 2021
Merged

Cleanup integraton tests for multi-arch case #3998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/helm_task_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func getHelmDeployTask(namespace, helmDeployTaskName string) *v1beta1.Task {
Name: "chartname", Type: v1beta1.ParamTypeString, Default: &empty,
}},
Steps: []v1beta1.Step{{Container: corev1.Container{
Image: getTestImage(helmImage),
Image: "alpine/helm:3.5.4",
Args: []string{
"upgrade",
"--wait",
Expand Down Expand Up @@ -328,7 +328,7 @@ func removeAllHelmReleases(ctx context.Context, c *clients, t *testing.T, namesp
Spec: v1beta1.TaskSpec{
Steps: []v1beta1.Step{{Container: corev1.Container{
Name: "helm-remove-all",
Image: getTestImage(helmImage),
Image: "alpine/helm:3.5.4",
Command: []string{"/bin/sh"},
Args: []string{"-c", fmt.Sprintf("helm ls --short --all --namespace %s | xargs -n1 helm delete --namespace %s", namespace, namespace)},
}}},
Expand Down
8 changes: 1 addition & 7 deletions test/multiarch_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ const (
registryImage
// kubectl image
kubectlImage
// helm image
helmImage
// kaniko executor image
kanikoImage
// dockerize image
Expand Down Expand Up @@ -68,7 +66,6 @@ func initImageNames() map[int]string {
busyboxImage: "busybox@sha256:4f47c01fa91355af2865ac10fef5bf6ec9c7f42ad2321377c21e844427972977",
registryImage: "ibmcom/registry:2.6.2.5",
kubectlImage: "ibmcom/kubectl:v1.13.9",
helmImage: "ibmcom/alpine-helm-s390x:latest",
kanikoImage: "gcr.io/kaniko-project/executor:s390x-9ed158c1f63a059cde4fd5f8b95af51d452d9aa7",
dockerizeImage: "ibmcom/dockerize-s390x",
}
Expand All @@ -77,7 +74,6 @@ func initImageNames() map[int]string {
busyboxImage: "busybox@sha256:4f47c01fa91355af2865ac10fef5bf6ec9c7f42ad2321377c21e844427972977",
registryImage: "ppc64le/registry:2",
kubectlImage: "ibmcom/kubectl:v1.13.9",
helmImage: "ibmcom/helm-ppc64le:latest",
kanikoImage: "ibmcom/kaniko-project-executor-ppc64le:v0.17.1",
dockerizeImage: "ibmcom/dockerize-ppc64le",
}
Expand All @@ -86,7 +82,6 @@ func initImageNames() map[int]string {
busyboxImage: "busybox@sha256:895ab622e92e18d6b461d671081757af7dbaa3b00e3e28e12505af7817f73649",
registryImage: "registry",
kubectlImage: "lachlanevenson/k8s-kubectl",
helmImage: "alpine/helm:3.1.2",
kanikoImage: "gcr.io/kaniko-project/executor:v1.3.0",
dockerizeImage: "jwilder/dockerize",
}
Expand All @@ -101,6 +96,7 @@ func getImagesMappingRE() map[*regexp.Regexp][]byte {

for existingImage, archSpecificImage := range imageNamesMapping {
imageMappingRE[regexp.MustCompile("(?im)image: "+existingImage+"$")] = []byte("image: " + archSpecificImage)
imageMappingRE[regexp.MustCompile("(?im)default: "+existingImage+"$")] = []byte("default: " + archSpecificImage)
}

return imageMappingRE
Expand Down Expand Up @@ -150,8 +146,6 @@ func initExcludedTests() sets.String {
// examples
"TestExamples/v1alpha1/taskruns/gcs-resource",
"TestExamples/v1beta1/taskruns/gcs-resource",
"TestExamples/v1beta1/pipelineruns/pipelinerun",
"TestYamls/yamls/v1beta1/pipelineruns/pipelinerun.yaml",
)
case "ppc64le":
return sets.NewString(
Expand Down