This job view page is being replaced by Spyglass soon. Check out the new job view.
PRolemarkus: Bump NTH to 1.16.4 and add support for scheduled instance change events
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2022-05-18 09:49
Elapsed0.00s
Revision
Refs 13662

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes/kops at master(19aafca270cdfb2a1f706704805f359ca1401fa3)
# Checking out pulls:
#	13662(b4f701a167f0d08016c7373089bb2f3563622f26)
$ PWD=/  mkdir -p /home/prow/go/src/k8s.io/kops
$ PWD=/home/prow/go/src/k8s.io/kops  git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 222 lines ...
CONFLICT (content): Merge conflict in tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content
Auto-merging tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
Auto-merging tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
Auto-merging tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
Auto-merging tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
Auto-merging tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1