[E2E] Add common function when we are adding a registry to tasks

Closes #145

Signed-off-by: Chmouel Boudjnah <chmouel@redhat.com>

buildah/tests/pre-apply-task-hook.sh

@@ -1,11 +1,5 @@
 #!/bin/bash
 
-# - TMPF is the temporary file where the YAML is processed.
-# - We are duplicating the temporary file since we cannot do the manipulation in
-#   place (i.e: reading and writing at the same time)
-cp ${TMPF} ${TMPF}.read
-
 # Add an internal registry as sidecar to the task so we can upload it directly
 # from our tests withouth having to go to an external registry.
-cat ${TMPF}.read | python -c 'import yaml,sys;data=yaml.load(sys.stdin.read());data["spec"]["sidecars"]=[{"image":"registry", "name": "registry"}];print(yaml.dump(data, default_flow_style=False));' > ${TMPF}
-rm -f ${TMPF}.read
+add_sidecar_registry ${TMPF}

jib-maven/tests/pre-apply-task-hook.sh

@@ -1,11 +1,5 @@
 #!/bin/bash
 
-# - TMPF is the temporary file where the YAML is processed.
-# - We are duplicating the temporary file since we cannot do the manipulation in
-#   place (i.e: reading and writing at the same time)
-cp ${TMPF} ${TMPF}.read
-
 # Add an internal registry as sidecar to the task so we can upload it directly
 # from our tests withouth having to go to an external registry.
-cat ${TMPF}.read | python -c 'import yaml,sys;data=yaml.load(sys.stdin.read());data["spec"]["sidecars"]=[{"image":"registry", "name": "registry"}];print(yaml.dump(data, default_flow_style=False));' > ${TMPF}
-rm -f ${TMPF}.read
+add_sidecar_registry ${TMPF}

kaniko/tests/pre-apply-task-hook.sh

@@ -1,11 +1,5 @@
 #!/bin/bash
 
-# - TMPF is the temporary file where the YAML is processed.
-# - We are duplicating the temporary file since we cannot do the manipulation in
-#   place (i.e: reading and writing at the same time)
-cp ${TMPF} ${TMPF}.read
-
 # Add an internal registry as sidecar to the task so we can upload it directly
 # from our tests withouth having to go to an external registry.
-cat ${TMPF}.read | python -c 'import yaml,sys;data=yaml.load(sys.stdin.read());data["spec"]["sidecars"]=[{"image":"registry", "name": "registry"}];print(yaml.dump(data, default_flow_style=False));' > ${TMPF}
-rm -f ${TMPF}.read
+add_sidecar_registry ${TMPF}

s2i/tests/pre-apply-task-hook.sh

@@ -1,12 +1,5 @@
 #!/bin/bash
 
-# - TMPF is the temporary file where the YAML is processed.
-# - We are duplicating the temporary file since we cannot do the manipulation in
-#   place (i.e: reading and writing at the same time)
-# - Here we simply add a sidecar to our task so we can upload there.
-cp ${TMPF} ${TMPF}.read
-
 # Add an internal registry as sidecar to the task so we can upload it directly
 # from our tests withouth having to go to an external registry.
-cat ${TMPF}.read | python -c 'import yaml,sys;data=yaml.load(sys.stdin.read());data["spec"]["sidecars"]=[{"image":"registry", "name": "registry"}];print(yaml.dump(data, default_flow_style=False));' > ${TMPF}
-rm -f ${TMPF}.read
+add_sidecar_registry ${TMPF}

test/e2e-common.sh

@@ -23,6 +23,15 @@ RELEASE_YAML=${RELEASE_YAML:-}
 
 source $(dirname $0)/../vendor/github.com/tektoncd/plumbing/scripts/e2e-tests.sh
 
+# Add an internal registry as sidecar to a task so we can upload it directly
+# from our tests withouth having to go to an external registry.
+function add_sidecar_registry() {
+    cp ${1} ${TMPF}.read
+
+    cat ${TMPF}.read | python -c 'import yaml,sys;data=yaml.load(sys.stdin.read());data["spec"]["sidecars"]=[{"image":"registry", "name": "registry"}];print(yaml.dump(data, default_flow_style=False));' > ${TMPF}
+    rm -f ${TMPF}.read
+}
+
 function install_pipeline_crd() {
   local latestreleaseyaml
   echo ">> Deploying Tekton Pipelines"