Factory AI Vision Jetson Templates Have Merge Markers In

[jedimasterjonny]

Please provide us with the following information:

This issue is for a: (mark with an x)

- [ ] bug report -> please search issues before submitting
- [ ] feature request
- [ ] documentation issue or request
- [X] regression (a behavior that used to work and stopped in a new release)

Both https://github.com/Azure-Samples/azure-intelligent-edge-patterns/blob/master/factory-ai-vision/EdgeSolution/deployment.jetson.template.json and https://github.com/Azure-Samples/azure-intelligent-edge-patterns/blob/master/factory-ai-vision/EdgeSolution/deployment.jetson.opencv.template.json have merge conflict markers in on the master branch.

I would offer a PR to resolve this - however the kakalin/ovms-server docker image the conflict references has no container for the ARMv8 architecture in use by the Jetson, so if this change was merged successfully, the deployment would still fail. Therefore I'm not sure what the desired resolution is.

Minimal steps to reproduce

Attempt a deployment using the deployment.jetson.template.json or deployment.jetson.opencv.template.json template

Any log messages given by the failure

• Leaving deployment as it is in the repository complains of invalid deployment .json
• Fixing the merge conflict attempts to use an amd64 container on Jetson causing manifest for kakalin/ovms-app:latest not found: manifest unknown: manifest unknown

Expected/desired behavior

Deployment to the Jetson works

OS and Version?

Tegra 4 Linux (Ubuntu 18.04) on Jetson NX

[penorouzi]

Thanks @jedimasterjonny. Hey, @waitingkuo can you please see why we have OVMS deployment as part of master branch (especially for Jetson devices)? Master branch should not have any OVMS specific references.