Skip to content

Commit

Permalink
Refresh list of s390x excluded images
Browse files Browse the repository at this point in the history
- 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 <[email protected]>
  • Loading branch information
barthy1 committed Oct 12, 2020
1 parent 27c76d2 commit 9caa493
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 46 deletions.
10 changes: 5 additions & 5 deletions .ko.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
defaultBaseImage: gcr.io/distroless/static:nonroot
defaultBaseImage: 172.18.40.55:4000/distroless/static:nonroot
baseImageOverrides:
# These base images run as root, which is needed for how they handle SSH credentials.
# They are produced from ./images/Dockerfile
github.com/tektoncd/pipeline/cmd/creds-init: gcr.io/tekton-nightly/github.com/tektoncd/pipeline/build-base:latest
github.com/tektoncd/pipeline/cmd/git-init: gcr.io/tekton-nightly/github.com/tektoncd/pipeline/build-base:latest
github.com/tektoncd/pipeline/cmd/creds-init: "172.18.40.55:4000/build-base:latest"
github.com/tektoncd/pipeline/cmd/git-init: "172.18.40.55:4000/build-base:latest"

# GCS fetcher needs root due to workspace permissions
github.com/tektoncd/pipeline/vendor/github.com/GoogleCloudPlatform/cloud-builders/gcs-fetcher/cmd/gcs-fetcher: gcr.io/distroless/static:latest
github.com/tektoncd/pipeline/vendor/github.com/GoogleCloudPlatform/cloud-builders/gcs-fetcher/cmd/gcs-fetcher: "172.18.40.55:4000/distroless/static:latest"
# PullRequest resource needs root because in output mode it needs to access pr.json
# which might have been copied or written with any level of permissions.
github.com/tektoncd/pipeline/cmd/pullrequest-init: gcr.io/distroless/static:latest
github.com/tektoncd/pipeline/cmd/pullrequest-init: "172.18.40.55:4000/distroless/static:latest"
2 changes: 1 addition & 1 deletion config/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
"-gsutil-image", "gcr.io/google.com/cloudsdktool/cloud-sdk@sha256:27b2c22bf259d9bc1a291e99c63791ba0c27a04d2db0a43241ba0f1f20f4067f",
# The shell image must be root in order to create directories and copy files to PVCs.
# gcr.io/distroless/base:debug as of October 5, 2020
"-shell-image", "gcr.io/distroless/base:debug@sha256:2c12bde3d050850e976fe682193b94f0855866ea4f37a12ed7db8668e8071047"
"-shell-image", "s390x/alpine",
]
volumeMounts:
- name: config-logging
Expand Down
2 changes: 1 addition & 1 deletion examples/v1alpha1/taskruns/docker-creds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ spec:
- name: test
image: quay.io/rhpipeline/skopeo:alpine
# Test pulling a private builder container.
script: skopeo copy docker://gcr.io/build-crd-testing/secret-sauce dir:///tmp/
script: skopeo copy docker://gcr.io/build-crd-testing/secret-sauce dir:///tmp/test
2 changes: 1 addition & 1 deletion examples/v1alpha1/taskruns/pull-private-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ spec:
- name: pull
# Private image is just Ubuntu
image: quay.io/rhpipeline/skopeo:alpine
script: skopeo copy docker://gcr.io/build-crd-testing/secret-sauce dir:///tmp/
script: skopeo copy docker://gcr.io/build-crd-testing/secret-sauce dir:///tmp/dir
6 changes: 3 additions & 3 deletions examples/v1beta1/taskruns/authenticating-git-commands.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/taskruns/docker-creds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ spec:
- name: test
image: quay.io/rhpipeline/skopeo:alpine
# Test pulling a private builder container.
script: skopeo copy docker://gcr.io/build-crd-testing/secret-sauce dir:///tmp/
script: skopeo copy docker://gcr.io/build-crd-testing/secret-sauce dir:///tmp/test
2 changes: 1 addition & 1 deletion examples/v1beta1/taskruns/pull-private-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ spec:
- name: pull
# Private image is just Ubuntu
image: quay.io/rhpipeline/skopeo:alpine
script: skopeo copy docker://gcr.io/build-crd-testing/secret-sauce dir:///tmp/
script: skopeo copy docker://gcr.io/build-crd-testing/secret-sauce dir:///tmp/test
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/tektoncd/pipeline
go 1.13

require (
cloud.google.com/go/storage v1.11.0 // indirect
cloud.google.com/go/storage v1.11.0
github.com/GoogleCloudPlatform/cloud-builders/gcs-fetcher v0.0.0-20191203181535-308b93ad1f39
github.com/cloudevents/sdk-go/v2 v2.1.0
github.com/ghodss/yaml v1.0.0
Expand All @@ -21,6 +21,7 @@ require (
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
gomodules.xyz/jsonpatch/v2 v2.1.0
google.golang.org/api v0.31.0
k8s.io/api v0.18.8
k8s.io/apimachinery v0.19.0
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
Expand Down
1 change: 1 addition & 0 deletions test/git_checkout_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ func TestGitPipelineRun(t *testing.T) {
// github fails as expected when an invalid revision or https proxy is passed
// on the pipelineresource.
func TestGitPipelineRunFail(t *testing.T) {
skipIfExcluded(t)
for _, tc := range []struct {
name string
revision string
Expand Down
2 changes: 1 addition & 1 deletion test/helm_task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
40 changes: 9 additions & 31 deletions test/multiarch_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ const (
busyboxImage = iota
// Registry image
registryImage
//kubectl image
kubectlImage
)

func init() {
Expand All @@ -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",
}
}

Expand All @@ -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",
}
}

Expand All @@ -108,43 +114,15 @@ 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",
)
Expand Down

0 comments on commit 9caa493

Please sign in to comment.