merge cookiecutter generated pipeline

merge auto and normal one

Change-Id: I68d0123fff5aa2ba4a4aea9e50dbe0384541117d
2 files changed