Disable git tagging during Jenkins git clone

Even with per-build-tag set to false, JJB 1.6.2 does not seem to remove
'Create tag for each build' from the git-scm settings. Though the option
is deprecated it is still supported, so setting both of these should
disable tagging when Jenkins clones a git repo.

Change-Id: I5977149ad581df67d938ce2b46794d47c5e06fe3
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index b7335fa..5b403ab 100644 (file)
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -107,6 +107,7 @@
             - 'origin/$BRANCH'
           timeout: 15
           per-build-tag: false
+          skip-tag: true
           shallow-clone: false
           use-author: false
           ignore-notify: false
@@ -129,6 +130,7 @@
           refspec: ''
           branches:
             - 'refs/heads/{branch}'
+          per-build-tag: false
           skip-tag: true
           wipe-workspace: true
           submodule:
@@ -139,6 +141,8 @@
     name: git-scm-openstack
     scm:
       - git: &git-scm-openstack-defaults
+          per-build-tag: false
+          skip-tag: true
           url: '$GIT_BASE'
           branches:
             - 'origin/$BRANCH'