Skip to content

Commit

Permalink
Merge pull request #136 from chmouel/sidecar-nop-image-use-upstream
Browse files Browse the repository at this point in the history
Use upstream nop image to fix sidecar tests.
  • Loading branch information
openshift-merge-robot authored Sep 24, 2019
2 parents 4995d17 + c5c11e9 commit 54883e2
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions openshift/e2e-tests-openshift.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ readonly OPENSHIFT_REGISTRY="${OPENSHIFT_REGISTRY:-"registry.svc.ci.openshift.or
readonly TEST_NAMESPACE=tekton-pipeline-tests
readonly TEST_YAML_NAMESPACE=tekton-pipeline-tests-yaml
readonly TEKTON_PIPELINE_NAMESPACE=tekton-pipelines
readonly IGNORES="pipelinerun.yaml|private-taskrun.yaml|taskrun.yaml|gcs-resource-spec-taskrun.yaml"
readonly IGNORES="pipelinerun.yaml|private-taskrun.yaml|taskrun.yaml|gcs|taskrun-git-volume.yaml"
readonly KO_DOCKER_REPO=image-registry.openshift-image-registry.svc:5000/tektoncd-pipeline
# Where the CRD will install the pipelines
readonly TEKTON_NAMESPACE=tekton-pipelines
Expand All @@ -19,7 +19,9 @@ readonly OPENSHIFT_BUILD_NAMESPACE=${OPENSHIFT_BUILD_NAMESPACE:-tektoncd-build-$
# Yaml test skipped due of not being able to run on openshift CI, usually becaus
# of rights.
# test-git-volume: `"gitRepo": gitRepo volumes are not allowed to be used]'
declare -ar SKIP_YAML_TEST=(test-git-volume)
# dind-sidecar-taskrun-1: securityContext.privileged: Invalid value: true: Privileged containers are not allowed]
# gcs: google container storage
declare -ar SKIP_YAML_TEST=(test-git-volume dind-sidecar-taskrun-1 build-gcs-targz build-gcs-zip gcs-resource)

function install_tekton_pipeline() {
header "Installing Tekton Pipeline"
Expand All @@ -33,6 +35,13 @@ function install_tekton_pipeline() {

function create_pipeline() {
resolve_resources config/ tekton-pipeline-resolved.yaml "nothing" $OPENSHIFT_REGISTRY/$OPENSHIFT_BUILD_NAMESPACE/stable

# NOTE(chmou): This is a very cheeky hack, sidecar is currently broken with
# our nop image so we just use nightly `nop` from upstream CI. `nop` should
# not change or do anything differently with a different base so we should be
# safe until https://github.com/tektoncd/pipeline/issues/1347 gets fixed
sed -i 's%"-nop-image.*%"-nop-image", "gcr.io/tekton-nightly/github.com/tektoncd/pipeline/cmd/nop:latest",%' tekton-pipeline-resolved.yaml

oc apply -f tekton-pipeline-resolved.yaml
}

Expand Down

0 comments on commit 54883e2

Please sign in to comment.