(Fixes tektoncd#481) prevent e2e-test script from overriding task sid…

…ecar

The end to end test attaches a sidecar with a image registry for tasks to push into to. This task is optional and is encouraged to be used for testing. However, the function add_sidecar_registry sets the sidecar registry instead of appending it. Allowing the sidecar-registry to run alongside with other tasks will fix this bug. tektoncd#481

task/jib-maven/0.1/jib-maven.yaml

@@ -46,6 +46,8 @@ spec:
     env:
     - name: HOME
       value: /workspace
+    - name: "DOCKER_CONFIG"
+      value: $(credentials.path)/.docker/
     volumeMounts:
     - name: $(params.CACHE)
       mountPath: /workspace/.m2

test/e2e-common.sh

@@ -27,8 +27,7 @@ source $(dirname $0)/../vendor/github.com/tektoncd/plumbing/scripts/e2e-tests.sh
 # from our tests withouth having to go to an external registry.
 function add_sidecar_registry() {
     cp ${1} ${TMPF}.read
-
-    cat ${TMPF}.read | python3 -c 'import yaml;f=open(0, encoding="utf-8"); data=yaml.load(f.read(), Loader=yaml.FullLoader);data["spec"]["sidecars"]=[{"image":"registry", "name": "registry"}];print(yaml.dump(data, default_flow_style=False));' > ${TMPF}
+    cat ${TMPF}.read | python3 utils.py add_sidecar_to_yaml_file > ${TMPF}
     rm -f ${TMPF}.read
 }
 

test/utils.py

@@ -0,0 +1,17 @@
+import sys
+import yaml
+
+def add_sidecar_to_yaml_file():
+    with sys.stdin as file:
+        # Load yaml file passed by stdin
+        data = yaml.load(file, Loader=yaml.FullLoader)
+        # If sidecars doesnt have any entries create an array for data manipulation
+        if 'sidecars' not in data['spec']:
+            data['spec']['sidecars'] = []
+        # Append the local image registry to the yaml file
+        data['spec']['sidecars'].append({"image": "registry", "name": "registry"})
+        # Dump the changes to the stdout
+        print(yaml.dump(data, default_flow_style=False))
+
+if __name__ == '__main__':
+    globals()[sys.argv[1]]()