From 97b947fe5ba27988a6af9a9adbca3efb5911eb92 Mon Sep 17 00:00:00 2001
From: Luis Araujo <luis.araujo@collabora.co.uk>
Date: Mon, 17 Dec 2018 23:20:00 +0800
Subject: [PATCH] Add the specific branch in the git repo macro

This will allow to show the specific branch that needs to be used
during cloning the tests scripts repository in the test cases
pages.

Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>
---
 atc_renderer/renderer.py              | 9 +++++----
 atc_renderer/templates/macros.html    | 8 ++++----
 atc_renderer/templates/test_case.html | 2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/atc_renderer/renderer.py b/atc_renderer/renderer.py
index 72ec8d5..bf77be1 100644
--- a/atc_renderer/renderer.py
+++ b/atc_renderer/renderer.py
@@ -135,16 +135,17 @@ def get_template_values(testcase_data):
     install = testcase_data.get('install')
     if is_automated and install:
         git_repos = install.get('git-repos', [])
-        git_repo_url = None
+        git_repo_url, git_repo_branch = None, None
         for gr in git_repos:
-            git_repo_url = gr.get('url')
-            if not git_repo_url:
-                print("Error: missing mandatory field install:git-repos:url for " \
+            git_repo_url, git_repo_branch = gr.get('url'), gr.get('branch')
+            if not git_repo_url or not git_repo_branch:
+                print("Error: missing mandatory field git-repos:url/branch for " \
                       "automated tests")
                 exit(1)
 
         template_values.update({ 'git_repo_url' : git_repo_url })
         template_values.update({ 'git_repo_dir' : get_git_repo_dir(git_repo_url) })
+        template_values.update({ 'git_repo_branch' : git_repo_branch })
 
         deps = install.get('deps')
         if deps:
diff --git a/atc_renderer/templates/macros.html b/atc_renderer/templates/macros.html
index 688590c..943f42b 100644
--- a/atc_renderer/templates/macros.html
+++ b/atc_renderer/templates/macros.html
@@ -1,9 +1,9 @@
-{% macro git_repo(git_repo_url, git_repo_dir) %}
+{% macro git_repo(url, dir, branch) %}
   <li class="mb-sm-2">Clone the tests repository from another computer <i>(Note that the branch being tested may change depending on the release, please make sure to clone the correct branch for the release in question)</i>:</li>
-  <p><kbd>$ git clone {{ git_repo_url }}</kbd></p>
-  <li class="mb-sm-2">Copy the test directory {{ git_repo_dir }} to the target device:</li>
+  <p><kbd>$ git clone --branch {{ branch }} {{ url }}</kbd></p>
+  <li class="mb-sm-2">Copy the test directory {{ dir }} to the target device:</li>
   <p><kbd>$ DUT_IP=&ltdevice-ip&gt</kbd></p>
-  <p><kbd>$ scp -r {{ git_repo_dir }} user@$DUT_IP:</kbd></p>
+  <p><kbd>$ scp -r {{ dir }} user@$DUT_IP:</kbd></p>
   <li class="mb-sm-2">Log into the target device:</li>
   <p><kbd>$ ssh user@$DUT_IP</kbd></p>
 {% endmacro %}
diff --git a/atc_renderer/templates/test_case.html b/atc_renderer/templates/test_case.html
index ec53cc4..c76ba81 100644
--- a/atc_renderer/templates/test_case.html
+++ b/atc_renderer/templates/test_case.html
@@ -43,7 +43,7 @@
       {% if pkgname %}{{ macros.ostree_preconditions(pkgname) }}{% endif %}
       {% if packages_list %}{{ macros.install_packages(packages_list) }}{% endif %}
       {% if libname %}{{ macros.modules_preconditions(libname) }}{% endif %}
-      {% if git_repo_url and not pkgname %}{{ macros.git_repo(git_repo_url, git_repo_dir) }}{% endif %}
+      {% if git_repo_url and not pkgname %}{{ macros.git_repo(git_repo_url, git_repo_dir, git_repo_branch) }}{% endif %}
       {% for comment, command, output, _, link in pre_conditions %}
       {% if comment %}<li class="mb-sm-2">{{ comment|e }}</li>{% endif %}
       {% if command %}<p><kbd>{{ command|e }}</kbd></p>{% endif %}
-- 
GitLab