This job view page is being replaced by Spyglass soon. Check out the new job view.
PRjustaugustus: [WIP] Minor cleanups for debian-iptables images
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-03-13 15:26
Elapsed0.00s
Revision
Refs 1622

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes/release at master(fce32c9696f0be229e9898e51cbbe8e497e72027)
# Checking out pulls:
#	1622(95b80e412063c3d0b53cb2f425bafd70b0243312)
$ mkdir -p /home/prow/go/src/k8s.io/release
$ git init
Initialized empty Git repository in /home/prow/go/src/k8s.io/release/.git/
... skipping 63 lines ...
Removing images/build/debian-iptables/buster/iptables-wrapper
Auto-merging images/build/debian-iptables/buster/Dockerfile
Auto-merging images/build/debian-iptables/Makefile
CONFLICT (content): Merge conflict in images/build/debian-iptables/Makefile
Auto-merging dependencies.yaml
CONFLICT (content): Merge conflict in dependencies.yaml
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1