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.

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

Refresh list of s390x excluded test #3527

Merged
merged 1 commit into from
Nov 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
optional: true
steps:
- name: build-an-image
image: "gcr.io/kaniko-project/executor:latest"
image: gcr.io/kaniko-project/executor:v1.3.0
command:
- /kaniko/executor
args:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1alpha1/pipelineruns/pipelinerun.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ spec:
type: image
steps:
- name: build-and-push
image: gcr.io/kaniko-project/executor:v0.17.1
image: gcr.io/kaniko-project/executor:v1.3.0
# specifying DOCKER_CONFIG is required to allow kaniko to detect docker credential
env:
- name: "DOCKER_CONFIG"
Expand Down
2 changes: 1 addition & 1 deletion examples/v1alpha1/taskruns/build-push-kaniko.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
type: image
steps:
- name: build-and-push
image: gcr.io/kaniko-project/executor:v0.17.1
image: gcr.io/kaniko-project/executor:v1.3.0
# specifying DOCKER_CONFIG is required to allow kaniko to detect docker credential
env:
- name: "DOCKER_CONFIG"
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/pipelineruns/demo-optional-resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
optional: true
steps:
- name: build-an-image
image: "gcr.io/kaniko-project/executor:latest"
image: gcr.io/kaniko-project/executor:v1.3.0
command:
- /kaniko/executor
args:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/pipelineruns/pipelinerun.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ spec:
default: ""
- name: BUILDER_IMAGE
description: The image on which builds will run
default: gcr.io/kaniko-project/executor:latest
default: gcr.io/kaniko-project/executor:v1.3.0
results:
- name: IMAGE_DIGEST
description: Digest of the image just built.
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/taskruns/authenticating-git-commands.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ spec:
git commit -m "Test commit!"
git push origin master
- name: git-clone-and-check
image: gcr.io/tekton-releases/dogfooding/alpine-git-nonroot:mario
image: gcr.io/tekton-releases/dogfooding/alpine-git-nonroot:latest
# Because this Step runs with a non-root security context, the creds-init
# credentials will fail to copy into /tekton/home. This happens because
# our previous step _already_ wrote to /tekton/home and ran as a root
Expand Down
6 changes: 3 additions & 3 deletions test/helm_task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func getCreateImageTask(namespace, createImageTaskName string) *v1beta1.Task {
},
Steps: []v1beta1.Step{{Container: corev1.Container{
Name: "kaniko",
Image: "gcr.io/kaniko-project/executor:v0.17.1",
Image: getTestImage(kanikoImage),
Args: []string{
"--dockerfile=/workspace/gitsource/test/gohelloworld/Dockerfile",
"--context=/workspace/gitsource/",
Expand Down 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: "alpine/helm:3.1.2",
Image: getTestImage(helmImage),
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: "alpine/helm:3.1.2",
Image: getTestImage(helmImage),
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
2 changes: 1 addition & 1 deletion test/kaniko_task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func getTask(repo, namespace string) *v1beta1.Task {
},
Steps: []v1beta1.Step{{Container: corev1.Container{
Name: "kaniko",
Image: "gcr.io/kaniko-project/executor:v0.17.1",
Image: getTestImage(kanikoImage),
Args: []string{
"--dockerfile=/workspace/gitsource/integration/dockerfiles/Dockerfile_test_label",
fmt.Sprintf("--destination=%s", repo),
Expand Down
32 changes: 18 additions & 14 deletions test/multiarch_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ const (
registryImage
//kubectl image
kubectlImage
//helm image
helmImage
//kaniko executor image
kanikoImage
)

func init() {
Expand All @@ -61,12 +65,16 @@ 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",
}
}
return 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",
}
}

Expand All @@ -88,10 +96,15 @@ 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",
"lachlanevenson/k8s-kubectl": getTestImage(kubectlImage),
"gcr.io/cloud-builders/git": "alpine/git:latest",
"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",
"mikefarah/yq": "danielxlee/yq:2.4.0",
"stedolan/jq": "ibmcom/jq-s390x:latest",
"gcr.io/kaniko-project/executor:v1.3.0": getTestImage(kanikoImage),
}
}

Expand All @@ -103,24 +116,15 @@ func initExcludedTests() sets.String {
if getTestArch() == "s390x" {
return sets.NewString(
//examples
"TestExamples/v1alpha1/taskruns/dind-sidecar",
"TestExamples/v1beta1/taskruns/dind-sidecar",
"TestExamples/v1alpha1/taskruns/build-gcs-targz",
"TestExamples/v1beta1/taskruns/build-gcs-targz",
"TestExamples/v1alpha1/taskruns/build-push-kaniko",
"TestExamples/v1alpha1/pipelineruns/pipelinerun",
"TestExamples/v1beta1/pipelineruns/pipelinerun",
"TestExamples/v1beta1/taskruns/build-gcs-zip",
"TestExamples/v1alpha1/taskruns/build-gcs-zip",
"TestExamples/v1beta1/taskruns/docker-creds",
"TestExamples/v1alpha1/taskruns/docker-creds",
"TestExamples/v1alpha1/taskruns/gcs-resource",
"TestExamples/v1beta1/taskruns/gcs-resource",
"TestExamples/v1beta1/taskruns/authenticating-git-commands",
"TestExamples/v1beta1/taskruns/workspace-in-sidecar",
"TestExamples/v1beta1/pipelineruns/pipelinerun",
//e2e
"TestHelmDeployPipelineRun",
"TestKanikoTaskRun",
)
}
return sets.NewString()
Expand Down
2 changes: 1 addition & 1 deletion test/v1alpha1/kaniko_task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func getTask(repo, namespace string) *v1alpha1.Task {
),
tb.StepSecurityContext(&corev1.SecurityContext{RunAsUser: &root}),
}
step := tb.Step("gcr.io/kaniko-project/executor:v0.17.1", stepOps...)
step := tb.Step("gcr.io/kaniko-project/executor:v1.3.0", stepOps...)
taskSpecOps = append(taskSpecOps, step)
sidecar := tb.Sidecar("registry", "registry")
taskSpecOps = append(taskSpecOps, sidecar)
Expand Down