-
Notifications
You must be signed in to change notification settings - Fork 552
Open
Labels
help wantedExtra attention is neededExtra attention is needed
Description
Component
None
Task description
Description
Related to #3406
TriggersAnnotationIT is failing on windows:
Error: TriggersAnnotationIT.ocResourceTask_whenRun_generatesOpenShiftManifestWithTriggersAnnotation:53 � IllegalArgument Values not equal for entry: 'image.openshift.io/triggers', expected '[ {
"from" : {
"kind" : "ImageStreamTag",
"name" : "triggersannotation:latest"
},
"fieldPath" : "spec.template.spec.containers[?(@.name==\"orgeclipsejkubeintegrationtestsgradle-triggersannotation\")].image"
} ]' but was '[ {
"from" : {
"kind" : "ImageStreamTag",
"name" : "triggersannotation:latest"
},
"fieldPath" : "spec.template.spec.containers[?(@.name==\"orgeclipsejkubeintegrationtestsgradle-triggersannotation\")].image"
} ]'
This issue looks related to one issue I had fixed #3014
Problem seems to be here :
Line 156 in 78e8631
return Serialization.asJson(triggerList); |
Jackson generates annotation with platform specific line delimiters /r/n
for windows.
If we change it like this, it makes test pass:
- return Serialization.asJson(triggerList);
+ return Serialization.asJson(triggerList).replaceAll("\r?\n", "\n");
Expected Behavior
TriggersAnnotationIT should pass on windows
Acceptance Criteria
- TriggersAnnotationIT should pass on windows and Linux
Metadata
Metadata
Assignees
Labels
help wantedExtra attention is neededExtra attention is needed