From 8cb09b95fba70ad78e3a9a8e29d810e0f8cf8feb Mon Sep 17 00:00:00 2001 From: Chmouel Boudjnah Date: Tue, 24 Sep 2019 10:22:38 +0200 Subject: [PATCH] Use upstream image for the nop image 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. Signed-off-by: Chmouel Boudjnah --- openshift/e2e-tests-openshift.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/openshift/e2e-tests-openshift.sh b/openshift/e2e-tests-openshift.sh index ee390b3bc2e..1db1ce114f2 100755 --- a/openshift/e2e-tests-openshift.sh +++ b/openshift/e2e-tests-openshift.sh @@ -35,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 -n 's%"-nop-image.*%"-nop-image", "gcr.io/tekton-nightly/github.com/tektoncd/pipeline/cmd/nop:latest",%;p' tekton-pipeline-resolved.yaml + oc apply -f tekton-pipeline-resolved.yaml }