From cdfeb7bf66b0eacfed3eaf2a77813d65ab0e29f2 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Thu, 26 May 2016 19:30:29 -0700 Subject: Update Git SCM so that extensions are configured correctly. Many configuration options have been extensions for at least 2 years, so update the generated XML to actually configure these options. Change-Id: Ic22ca4a6b8d61c977979a5eb63a2e884dc4391bd --- jenkins_jobs/modules/scm.py | 206 +++++++++++++-------- tests/duplicates/fixtures/allow_duplicates001.xml | 10 - tests/duplicates/fixtures/allow_macros001.xml | 10 - tests/duplicates/fixtures/allow_projects001.xml | 10 - tests/duplicates/fixtures/allow_templates001.xml | 10 - tests/duplicates/fixtures/duplicates001.xml | 20 -- tests/duplicates/fixtures/duplicates002.xml | 20 -- tests/jsonparser/fixtures/complete001.xml | 14 +- tests/macros/fixtures/scm/multi-scms001.xml | 20 -- tests/macros/fixtures/scm/multi-scms002.xml | 10 - tests/macros/fixtures/scm/obj-in-scm-macro001.xml | 13 +- tests/macros/fixtures/scm/scm002.xml | 10 - tests/scm/fixtures/git-clean01.xml | 10 - tests/scm/fixtures/git-extensions01.xml | 45 +++++ tests/scm/fixtures/git-extensions01.yaml | 16 ++ tests/scm/fixtures/git-extensions02.xml | 31 ++++ tests/scm/fixtures/git-extensions02.yaml | 11 ++ .../git-ignore-commits-with-messages01.xml | 12 +- tests/scm/fixtures/git-ignore-notify01.xml | 11 +- tests/scm/fixtures/git-ignore-notify02.xml | 10 - tests/scm/fixtures/git-ignore-notify03.xml | 10 - tests/scm/fixtures/git-multiple-remotes.xml | 10 - .../fixtures/git-polling-path-restriction01.xml | 10 - .../fixtures/git-polling-path-restriction02.xml | 10 - tests/scm/fixtures/git-shallow-clone01.xml | 13 +- tests/scm/fixtures/git-shallow-clone02.xml | 13 +- tests/scm/fixtures/git-shallow-clone03.xml | 10 - tests/scm/fixtures/git-sparse-checkout01.xml | 12 +- tests/scm/fixtures/git-submodule01.xml | 10 - tests/scm/fixtures/git001.xml | 17 +- tests/scm/fixtures/git002.xml | 17 +- tests/scm/fixtures/git003.xml | 26 +-- tests/scm/fixtures/gitlab.xml | 10 - tests/scm/fixtures/local-branch001.xml | 14 +- tests/scm/fixtures/raw001.xml | 10 - tests/scm/fixtures/stash.xml | 10 - tests/yamlparser/fixtures/complete001.xml | 14 +- tests/yamlparser/fixtures/scm_remote_deep_bug.xml | 10 - 38 files changed, 268 insertions(+), 457 deletions(-) create mode 100644 tests/scm/fixtures/git-extensions01.xml create mode 100644 tests/scm/fixtures/git-extensions01.yaml create mode 100644 tests/scm/fixtures/git-extensions02.xml create mode 100644 tests/scm/fixtures/git-extensions02.yaml diff --git a/jenkins_jobs/modules/scm.py b/jenkins_jobs/modules/scm.py index 8ab74aea..b1a884a2 100644 --- a/jenkins_jobs/modules/scm.py +++ b/jenkins_jobs/modules/scm.py @@ -70,26 +70,11 @@ def git(parser, xml_parent, data): code) visible after you clicked credential under Jenkins Global credentials. (optional) :arg list(str) branches: list of branch specifiers to build (default '**') - :arg list(str) excluded-users: list of users to ignore revisions from - when polling for changes. (if polling is enabled, optional) - :arg list(str) included-regions: list of file/folders to include (optional) - :arg list(str) excluded-regions: list of file/folders to exclude (optional) - :arg str local-branch: Checkout/merge to local branch (optional) - :arg dict merge: - :merge: - * **remote** (`string`) - name of repo that contains branch to - merge to (default 'origin') - * **branch** (`string`) - name of the branch to merge to - * **strategy** (`string`) - merge strategy. Can be one of - 'default', 'resolve', 'recursive', 'octopus', 'ours', - 'subtree'. (default 'default') - * **fast-forward-mode** (`string`) - merge fast-forward mode. - Can be one of 'FF', 'FF_ONLY' or 'NO_FF'. (default 'FF') - :arg str basedir: location relative to the workspace root to clone to - (default workspace) - :arg bool skip-tag: Skip tagging (default false) - :arg bool shallow-clone: Perform shallow clone (default false) - :arg bool prune: Prune remote branches (default false) + :arg bool skip-tag: Skip tagging (default true) + + .. deprecated:: 1.6.0. Please use per-build-tag extension, which has + the inverse meaning. + :arg bool clean: Clean after checkout (default false) .. deprecated:: 1.1.1. Please use clean extension format. @@ -104,14 +89,10 @@ def git(parser, xml_parent, data): .. deprecated:: 1.1.1. Please use submodule extension. - :arg bool use-author: Use author rather than committer in Jenkin's build - changeset (default false) :arg str git-tool: The name of the Git installation to use (default 'Default') :arg str reference-repo: Path of the reference repo to use during clone (optional) - :arg str scm-name: The unique scm name for this Git SCM (optional) - :arg bool ignore-notify: Ignore notifyCommit URL accesses (default false) :arg str browser: what repository browser to use. :browsers supported: @@ -141,25 +122,54 @@ def git(parser, xml_parent, data): :arg str project-name: project name in Gitblit and ViewGit repobrowser (optional) :arg str repo-name: repository name in phabricator repobrowser (optional) - :arg str choosing-strategy: Jenkins class for selecting what to build. - Can be one of `default`, `inverse`, or `gerrit` (default 'default') :arg str git-config-name: Configure name for Git clone (optional) :arg str git-config-email: Configure email for Git clone (optional) :extensions: + * **basedir** (`string`) - Location relative to the workspace root to + clone to (default workspace) * **changelog-against** (`dict`) * **remote** (`string`) - name of repo that contains branch to create changelog against (default 'origin') * **branch** (`string`) - name of the branch to create changelog against (default 'master') + * **choosing-strategy**: (`string`) - Jenkins class for selecting what + to build. Can be one of `default`,`inverse`, or `gerrit` + (default 'default') * **clean** (`dict`) * **after** (`bool`) - Clean the workspace after checkout * **before** (`bool`) - Clean the workspace before checkout + * **excluded-users**: (`list(string)`) - list of users to ignore + revisions from when polling for changes. + (if polling is enabled, optional) + * **included-regions**: (`list(string)`) - list of file/folders to + include (optional) + * **excluded-regions**: (`list(string)`) - list of file/folders to + exclude (optional) * **ignore-commits-with-messages** (`list(str)`) - Revisions committed - with messages matching these patterns will be ignored. (optional) + with messages matching these patterns will be ignored. (optional) + * **ignore-notify**: (`bool`) - Ignore notifyCommit URL accesses + (default false) * **force-polling-using-workspace** (`bool`) - Force polling using - workspace (default false) + workspace (default false) + * **local-branch** (`string`) - Checkout/merge to local branch + (optional) + * **merge** (`dict`) + * **remote** (`string`) - name of repo that contains branch to + merge to (default 'origin') + * **branch** (`string`) - name of the branch to merge to + * **strategy** (`string`) - merge strategy. Can be one of + 'default', 'resolve', 'recursive', 'octopus', 'ours', + 'subtree'. (default 'default') + * **fast-forward-mode** (`string`) - merge fast-forward mode. + Can be one of 'FF', 'FF_ONLY' or 'NO_FF'. (default 'FF') + * **per-build-tag** (`bool`) - Create a tag in the workspace for every + build. (default is inverse of skip-tag if set, otherwise false) + * **prune** (`bool`) - Prune remote branches (default false) + * **scm-name** (`string`) - The unique scm name for this Git SCM + (optional) + * **shallow-clone** (`bool`) - Perform shallow clone (default false) * **sparse-checkout** (`dict`) * **paths** (`list`) - List of paths to sparse checkout. (optional) * **submodule** (`dict`) @@ -176,6 +186,8 @@ def git(parser, xml_parent, data): * **timeout** (`int`) - Specify a timeout (in minutes) for submodules operations (default: 10). * **timeout** (`str`) - Timeout for git commands in minutes (optional) + * **use-author** (`bool`): Use author rather than committer in Jenkin's + build changeset (default false) * **wipe-workspace** (`bool`) - Wipe out workspace before build (default true) @@ -197,20 +209,14 @@ def git(parser, xml_parent, data): ("disable-submodules", 'disableSubmodules', False), ("recursive-submodules", 'recursiveSubmodules', False), (None, 'doGenerateSubmoduleConfigurations', False), - ("use-author", 'authorOrCommitter', False), - ("wipe-workspace", 'wipeOutWorkspace', True), - ("prune", 'pruneBranches', False), + # XXX is this the same as force-polling-using-workspace? ("fastpoll", 'remotePoll', False), + # XXX does this option still exist? ("git-tool", 'gitTool', "Default"), (None, 'submoduleCfg', '', {'class': 'list'}), - ('basedir', 'relativeTargetDir', ''), ('reference-repo', 'reference', ''), ("git-config-name", 'gitConfigName', ''), ("git-config-email", 'gitConfigEmail', ''), - ('skip-tag', 'skipTag', False), - ('scm-name', 'scmName', ''), - ("shallow-clone", "useShallowClone", False), - ("ignore-notify", "ignoreNotifyCommit", False), ] choosing_strategies = { @@ -250,36 +256,6 @@ def git(parser, xml_parent, data): for branch in branches: bspec = XML.SubElement(xml_branches, 'hudson.plugins.git.BranchSpec') XML.SubElement(bspec, 'name').text = branch - excluded_users = '\n'.join(data.get('excluded-users', [])) - XML.SubElement(scm, 'excludedUsers').text = excluded_users - if 'merge' in data: - merge = data['merge'] - merge_strategies = ['default', 'resolve', 'recursive', 'octopus', - 'ours', 'subtree'] - fast_forward_modes = ['FF', 'FF_ONLY', 'NO_FF'] - name = merge.get('remote', 'origin') - branch = merge['branch'] - urc = XML.SubElement(scm, 'userMergeOptions') - XML.SubElement(urc, 'mergeRemote').text = name - XML.SubElement(urc, 'mergeTarget').text = branch - strategy = merge.get('strategy', 'default') - if strategy not in merge_strategies: - raise InvalidAttributeError('strategy', strategy, merge_strategies) - XML.SubElement(urc, 'mergeStrategy').text = strategy - fast_forward_mode = merge.get('fast-forward-mode', 'FF') - if fast_forward_mode not in fast_forward_modes: - raise InvalidAttributeError('fast-forward-mode', fast_forward_mode, - fast_forward_modes) - XML.SubElement(urc, 'fastForwardMode').text = fast_forward_mode - - try: - choosing_strategy = choosing_strategies[data.get('choosing-strategy', - 'default')] - except KeyError: - raise ValueError('Invalid choosing-strategy %r' % - data.get('choosing-strategy')) - XML.SubElement(scm, 'buildChooser', {'class': choosing_strategy}) - for elem in mapping: (optname, xmlname, val) = elem[:3] @@ -306,21 +282,13 @@ def git(parser, xml_parent, data): else: xe.text = val - if 'local-branch' in data: - XML.SubElement(scm, 'localBranch').text = data['local-branch'] - exts_node = XML.SubElement(scm, 'extensions') impl_prefix = 'hudson.plugins.git.extensions.impl.' - if 'included-regions' in data or 'excluded-regions' in data: - ext_name = XML.SubElement(exts_node, - 'hudson.plugins.git.extensions.impl.' - 'PathRestriction') - if 'included-regions' in data: - include_string = '\n'.join(data['included-regions']) - XML.SubElement(ext_name, 'includedRegions').text = include_string - if 'excluded-regions' in data: - exclude_string = '\n'.join(data['excluded-regions']) - XML.SubElement(ext_name, 'excludedRegions').text = exclude_string + + if 'basedir' in data: + ext = XML.SubElement(exts_node, + impl_prefix + 'RelativeTargetDirectory') + XML.SubElement(ext, 'relativeTargetDir').text = data['basedir'] if 'changelog-against' in data: ext_name = impl_prefix + 'ChangelogToBranch' ext = XML.SubElement(exts_node, ext_name) @@ -329,6 +297,15 @@ def git(parser, xml_parent, data): change_branch = data['changelog-against'].get('branch', 'master') XML.SubElement(opts, 'compareRemote').text = change_remote XML.SubElement(opts, 'compareTarget').text = change_branch + if 'choosing-strategy' in data: + try: + choosing_strategy = choosing_strategies[ + data.get('choosing-strategy')] + except KeyError: + raise ValueError('Invalid choosing-strategy %r' % + data.get('choosing-strategy')) + ext = XML.SubElement(exts_node, impl_prefix + 'BuildChooserSetting') + XML.SubElement(ext, 'buildChooser', {'class': choosing_strategy}) if 'clean' in data: # Keep support for old format 'clean' configuration by checking # if 'clean' is boolean. Else we're using the new extensions style. @@ -347,11 +324,57 @@ def git(parser, xml_parent, data): if clean_before: ext_name = impl_prefix + 'CleanBeforeCheckout' ext = XML.SubElement(exts_node, ext_name) + if 'excluded-users' in data: + excluded_users = '\n'.join(data['excluded-users']) + ext = XML.SubElement(exts_node, impl_prefix + 'UserExclusion') + XML.SubElement(ext, 'excludedUsers').text = excluded_users + if 'included-regions' in data or 'excluded-regions' in data: + ext = XML.SubElement(exts_node, + 'hudson.plugins.git.extensions.impl.' + 'PathRestriction') + if 'included-regions' in data: + include_string = '\n'.join(data['included-regions']) + XML.SubElement(ext, 'includedRegions').text = include_string + if 'excluded-regions' in data: + exclude_string = '\n'.join(data['excluded-regions']) + XML.SubElement(ext, 'excludedRegions').text = exclude_string if 'ignore-commits-with-messages' in data: for msg in data['ignore-commits-with-messages']: ext_name = impl_prefix + 'MessageExclusion' ext = XML.SubElement(exts_node, ext_name) XML.SubElement(ext, 'excludedMessage').text = msg + if 'local-branch' in data: + ext = XML.SubElement(exts_node, impl_prefix + 'LocalBranch') + XML.SubElement(ext, 'localBranch').text = str(data['local-branch']) + if 'merge' in data: + merge = data['merge'] + merge_strategies = ['default', 'resolve', 'recursive', 'octopus', + 'ours', 'subtree'] + fast_forward_modes = ['FF', 'FF_ONLY', 'NO_FF'] + name = merge.get('remote', 'origin') + branch = merge['branch'] + ext = XML.SubElement(exts_node, impl_prefix + 'PreBuildMerge') + merge_opts = XML.SubElement(ext, 'options') + XML.SubElement(merge_opts, 'mergeRemote').text = name + XML.SubElement(merge_opts, 'mergeTarget').text = branch + strategy = merge.get('strategy', 'default') + if strategy not in merge_strategies: + raise InvalidAttributeError('strategy', strategy, merge_strategies) + XML.SubElement(merge_opts, 'mergeStrategy').text = strategy + fast_forward_mode = merge.get('fast-forward-mode', 'FF') + if fast_forward_mode not in fast_forward_modes: + raise InvalidAttributeError('fast-forward-mode', fast_forward_mode, + fast_forward_modes) + XML.SubElement(merge_opts, 'fastForwardMode').text = fast_forward_mode + if 'scm-name' in data: + ext = XML.SubElement(exts_node, impl_prefix + 'ScmName') + XML.SubElement(ext, 'name').text = str(data['scm-name']) + if 'shallow-clone' in data or 'timeout' in data: + clo = XML.SubElement(exts_node, impl_prefix + 'CloneOption') + XML.SubElement(clo, 'shallow').text = str( + data.get('shallow-clone', False)).lower() + if 'timeout' in data: + XML.SubElement(clo, 'timeout').text = str(data['timeout']) if 'sparse-checkout' in data: ext_name = impl_prefix + 'SparseCheckoutPaths' ext = XML.SubElement(exts_node, ext_name) @@ -378,19 +401,40 @@ def git(parser, xml_parent, data): if 'timeout' in data: co = XML.SubElement(exts_node, impl_prefix + 'CheckoutOption') XML.SubElement(co, 'timeout').text = str(data['timeout']) - clo = XML.SubElement(exts_node, impl_prefix + 'CloneOption') - XML.SubElement(clo, 'timeout').text = str(data['timeout']) + polling_using_workspace = str(data.get('force-polling-using-workspace', False)).lower() if polling_using_workspace == 'true': ext_name = impl_prefix + 'DisableRemotePoll' ext = XML.SubElement(exts_node, ext_name) + if 'per-build-tag' in data or 'skip-tag' in data: + # We want to support both skip-tag (the old option) and per-build-tag + # (the new option), with the new one overriding the old one. + # Unfortunately they have inverse meanings, so we have to be careful. + # The default value of per-build-tag is False if skip-tag is not set, + # so we set the default value of skip-tag to True. + per_build_tag_default = False + if str(data.get('skip-tag', True)).lower == 'false': + per_build_tag_default = True + if str(data.get('per-build-tag', + per_build_tag_default)).lower() == 'true': + XML.SubElement(exts_node, impl_prefix + 'PerBuildTag') + prune = str(data.get('prune', False)).lower() + if prune == 'true': + XML.SubElement(exts_node, impl_prefix + 'PruneStaleBranch') + ignore_notify_commits = str(data.get('ignore-notify', False)).lower() + if ignore_notify_commits == 'true': + XML.SubElement(exts_node, impl_prefix + 'IgnoreNotifyCommit') # By default we wipe the workspace wipe_workspace = str(data.get('wipe-workspace', True)).lower() if wipe_workspace == 'true': ext_name = impl_prefix + 'WipeWorkspace' ext = XML.SubElement(exts_node, ext_name) + use_author = str(data.get('use-author', False)).lower() + if use_author == 'true': + XML.SubElement(exts_node, impl_prefix + 'AuthorInChangelog') + browser = data.get('browser', 'auto') browserdict = {'auto': 'auto', 'assemblaweb': 'AssemblaWeb', diff --git a/tests/duplicates/fixtures/allow_duplicates001.xml b/tests/duplicates/fixtures/allow_duplicates001.xml index feaf936c..10bed4eb 100644 --- a/tests/duplicates/fixtures/allow_duplicates001.xml +++ b/tests/duplicates/fixtures/allow_duplicates001.xml @@ -22,25 +22,15 @@ ** - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/duplicates/fixtures/allow_macros001.xml b/tests/duplicates/fixtures/allow_macros001.xml index 11af850e..56e8647e 100644 --- a/tests/duplicates/fixtures/allow_macros001.xml +++ b/tests/duplicates/fixtures/allow_macros001.xml @@ -22,25 +22,15 @@ origin/stable-2 - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/duplicates/fixtures/allow_projects001.xml b/tests/duplicates/fixtures/allow_projects001.xml index cca4681d..a0942b7b 100644 --- a/tests/duplicates/fixtures/allow_projects001.xml +++ b/tests/duplicates/fixtures/allow_projects001.xml @@ -22,25 +22,15 @@ origin/stable-2 - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/duplicates/fixtures/allow_templates001.xml b/tests/duplicates/fixtures/allow_templates001.xml index cca4681d..a0942b7b 100644 --- a/tests/duplicates/fixtures/allow_templates001.xml +++ b/tests/duplicates/fixtures/allow_templates001.xml @@ -22,25 +22,15 @@ origin/stable-2 - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/duplicates/fixtures/duplicates001.xml b/tests/duplicates/fixtures/duplicates001.xml index 787f05b0..23b48908 100644 --- a/tests/duplicates/fixtures/duplicates001.xml +++ b/tests/duplicates/fixtures/duplicates001.xml @@ -22,25 +22,15 @@ stable/1.1 - - false false false - false - true - false false Default - - false - - false - false @@ -74,25 +64,15 @@ stable/2.0 - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/duplicates/fixtures/duplicates002.xml b/tests/duplicates/fixtures/duplicates002.xml index 8ad81ccc..59823050 100644 --- a/tests/duplicates/fixtures/duplicates002.xml +++ b/tests/duplicates/fixtures/duplicates002.xml @@ -22,25 +22,15 @@ origin/stable-1.1 - - false false false - false - true - false false Default - - false - - false - false @@ -74,25 +64,15 @@ origin/stable-2.0 - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/jsonparser/fixtures/complete001.xml b/tests/jsonparser/fixtures/complete001.xml index 506a8696..3b189335 100644 --- a/tests/jsonparser/fixtures/complete001.xml +++ b/tests/jsonparser/fixtures/complete001.xml @@ -22,27 +22,21 @@ origin/** - - false false false - false - true - true false Default - - false - - false - false + + + + diff --git a/tests/macros/fixtures/scm/multi-scms001.xml b/tests/macros/fixtures/scm/multi-scms001.xml index 6ab7c8a6..23e67d2b 100644 --- a/tests/macros/fixtures/scm/multi-scms001.xml +++ b/tests/macros/fixtures/scm/multi-scms001.xml @@ -24,25 +24,15 @@ origin/master - - false false false - false - true - false false Default - - false - - false - false @@ -61,25 +51,15 @@ origin/master - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/macros/fixtures/scm/multi-scms002.xml b/tests/macros/fixtures/scm/multi-scms002.xml index e3d6bfaf..e09322cc 100644 --- a/tests/macros/fixtures/scm/multi-scms002.xml +++ b/tests/macros/fixtures/scm/multi-scms002.xml @@ -42,25 +42,15 @@ origin/master - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/macros/fixtures/scm/obj-in-scm-macro001.xml b/tests/macros/fixtures/scm/obj-in-scm-macro001.xml index 363ea4f2..0dd63a6b 100644 --- a/tests/macros/fixtures/scm/obj-in-scm-macro001.xml +++ b/tests/macros/fixtures/scm/obj-in-scm-macro001.xml @@ -25,26 +25,19 @@ other-branch - - false - false - false - false true Default - - true - - true - false + + true + false true diff --git a/tests/macros/fixtures/scm/scm002.xml b/tests/macros/fixtures/scm/scm002.xml index d38872e1..564311dc 100644 --- a/tests/macros/fixtures/scm/scm002.xml +++ b/tests/macros/fixtures/scm/scm002.xml @@ -22,25 +22,15 @@ origin/master - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/scm/fixtures/git-clean01.xml b/tests/scm/fixtures/git-clean01.xml index d22263d1..f742cf4f 100644 --- a/tests/scm/fixtures/git-clean01.xml +++ b/tests/scm/fixtures/git-clean01.xml @@ -14,25 +14,15 @@ ** - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/scm/fixtures/git-extensions01.xml b/tests/scm/fixtures/git-extensions01.xml new file mode 100644 index 00000000..8f9fd2b9 --- /dev/null +++ b/tests/scm/fixtures/git-extensions01.xml @@ -0,0 +1,45 @@ + + + + 2 + + + origin + +refs/heads/*:refs/remotes/origin/* + https://example.com/project.git + + + + + master + + + false + false + false + false + Default + + + + + + + go/src/github.com/foo/example + + + alice@example.com +bob@example.com + + + something_special + + + + + + + http://github.com/foo/example.git + + + diff --git a/tests/scm/fixtures/git-extensions01.yaml b/tests/scm/fixtures/git-extensions01.yaml new file mode 100644 index 00000000..96868207 --- /dev/null +++ b/tests/scm/fixtures/git-extensions01.yaml @@ -0,0 +1,16 @@ +scm: + - git: + url: https://example.com/project.git + branches: + - master + browser: githubweb + browser-url: http://github.com/foo/example.git + basedir: 'go/src/github.com/foo/example' + excluded-users: + - alice@example.com + - bob@example.com + per-build-tag: true + prune: true + scm-name: something_special + use-author: true + wipe-workspace: false diff --git a/tests/scm/fixtures/git-extensions02.xml b/tests/scm/fixtures/git-extensions02.xml new file mode 100644 index 00000000..f5d8328e --- /dev/null +++ b/tests/scm/fixtures/git-extensions02.xml @@ -0,0 +1,31 @@ + + + + 2 + + + origin + +refs/heads/*:refs/remotes/origin/* + https://example.com/project.git + + + + + master + + + false + false + false + false + Default + + + + + + + http://github.com/foo/example.git + + + diff --git a/tests/scm/fixtures/git-extensions02.yaml b/tests/scm/fixtures/git-extensions02.yaml new file mode 100644 index 00000000..b4805fa3 --- /dev/null +++ b/tests/scm/fixtures/git-extensions02.yaml @@ -0,0 +1,11 @@ +scm: + - git: + url: https://example.com/project.git + branches: + - master + browser: githubweb + browser-url: http://github.com/foo/example.git + per-build-tag: false + prune: false + use-author: false + wipe-workspace: false diff --git a/tests/scm/fixtures/git-ignore-commits-with-messages01.xml b/tests/scm/fixtures/git-ignore-commits-with-messages01.xml index 6b58782b..df63c7a6 100644 --- a/tests/scm/fixtures/git-ignore-commits-with-messages01.xml +++ b/tests/scm/fixtures/git-ignore-commits-with-messages01.xml @@ -14,25 +14,15 @@ ** - - false false false - false - true - false false Default - - false - - false - false (?s).*FOO.* @@ -43,4 +33,4 @@ - \ No newline at end of file + diff --git a/tests/scm/fixtures/git-ignore-notify01.xml b/tests/scm/fixtures/git-ignore-notify01.xml index 48ebc27c..c6d2abe3 100644 --- a/tests/scm/fixtures/git-ignore-notify01.xml +++ b/tests/scm/fixtures/git-ignore-notify01.xml @@ -14,27 +14,18 @@ master - - false false false - false - true - false false Default - - false - - false - true + diff --git a/tests/scm/fixtures/git-ignore-notify02.xml b/tests/scm/fixtures/git-ignore-notify02.xml index 6a2944f8..c9468855 100644 --- a/tests/scm/fixtures/git-ignore-notify02.xml +++ b/tests/scm/fixtures/git-ignore-notify02.xml @@ -14,25 +14,15 @@ master - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/scm/fixtures/git-ignore-notify03.xml b/tests/scm/fixtures/git-ignore-notify03.xml index 6a2944f8..c9468855 100644 --- a/tests/scm/fixtures/git-ignore-notify03.xml +++ b/tests/scm/fixtures/git-ignore-notify03.xml @@ -14,25 +14,15 @@ master - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/scm/fixtures/git-multiple-remotes.xml b/tests/scm/fixtures/git-multiple-remotes.xml index d5ac5d40..d99d5bb6 100644 --- a/tests/scm/fixtures/git-multiple-remotes.xml +++ b/tests/scm/fixtures/git-multiple-remotes.xml @@ -20,25 +20,15 @@ github/master - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/scm/fixtures/git-polling-path-restriction01.xml b/tests/scm/fixtures/git-polling-path-restriction01.xml index 6ec4ed88..8bee4e13 100644 --- a/tests/scm/fixtures/git-polling-path-restriction01.xml +++ b/tests/scm/fixtures/git-polling-path-restriction01.xml @@ -14,25 +14,15 @@ ** - - false false false - false - true - false false Default - - false - - false - false jenkins_jobs diff --git a/tests/scm/fixtures/git-polling-path-restriction02.xml b/tests/scm/fixtures/git-polling-path-restriction02.xml index e17a8fb4..f0ff742c 100644 --- a/tests/scm/fixtures/git-polling-path-restriction02.xml +++ b/tests/scm/fixtures/git-polling-path-restriction02.xml @@ -14,25 +14,15 @@ ** - - false false false - false - true - false false Default - - false - - false - false doc diff --git a/tests/scm/fixtures/git-shallow-clone01.xml b/tests/scm/fixtures/git-shallow-clone01.xml index 8b9bf77f..f2ffe1c7 100644 --- a/tests/scm/fixtures/git-shallow-clone01.xml +++ b/tests/scm/fixtures/git-shallow-clone01.xml @@ -15,27 +15,20 @@ master - - false false false - false - true - false false Default - - false - - true - false + + true + diff --git a/tests/scm/fixtures/git-shallow-clone02.xml b/tests/scm/fixtures/git-shallow-clone02.xml index 6a2944f8..416929e4 100644 --- a/tests/scm/fixtures/git-shallow-clone02.xml +++ b/tests/scm/fixtures/git-shallow-clone02.xml @@ -14,27 +14,20 @@ master - - false false false - false - true - false false Default - - false - - false - false + + false + diff --git a/tests/scm/fixtures/git-shallow-clone03.xml b/tests/scm/fixtures/git-shallow-clone03.xml index 6a2944f8..c9468855 100644 --- a/tests/scm/fixtures/git-shallow-clone03.xml +++ b/tests/scm/fixtures/git-shallow-clone03.xml @@ -14,25 +14,15 @@ master - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/scm/fixtures/git-sparse-checkout01.xml b/tests/scm/fixtures/git-sparse-checkout01.xml index 6d559b76..63d3302b 100644 --- a/tests/scm/fixtures/git-sparse-checkout01.xml +++ b/tests/scm/fixtures/git-sparse-checkout01.xml @@ -14,25 +14,15 @@ ** - - false false false - false - true - false false Default - - false - - false - false @@ -50,4 +40,4 @@ - \ No newline at end of file + diff --git a/tests/scm/fixtures/git-submodule01.xml b/tests/scm/fixtures/git-submodule01.xml index 6004f516..9aac9a46 100644 --- a/tests/scm/fixtures/git-submodule01.xml +++ b/tests/scm/fixtures/git-submodule01.xml @@ -14,23 +14,13 @@ ** - - false - false - true - false false Default - - false - - false - false true diff --git a/tests/scm/fixtures/git001.xml b/tests/scm/fixtures/git001.xml index 26c38058..c0f3746f 100644 --- a/tests/scm/fixtures/git001.xml +++ b/tests/scm/fixtures/git001.xml @@ -17,32 +17,23 @@ stable - - false false false - false - true - false false Default - - false - - false - false - - 20 - + false 20 + + 20 + diff --git a/tests/scm/fixtures/git002.xml b/tests/scm/fixtures/git002.xml index ad74997a..fcd474b1 100644 --- a/tests/scm/fixtures/git002.xml +++ b/tests/scm/fixtures/git002.xml @@ -17,25 +17,15 @@ stable - - false false false - false - true - false false Default - - false - - false - false @@ -43,12 +33,13 @@ master - - 20 - + false 20 + + 20 + diff --git a/tests/scm/fixtures/git003.xml b/tests/scm/fixtures/git003.xml index 0c3b24ed..f3c49128 100644 --- a/tests/scm/fixtures/git003.xml +++ b/tests/scm/fixtures/git003.xml @@ -14,32 +14,24 @@ ** - - - repo_name - branch_name - recursive - FF_ONLY - - false false false - false - true - false false Default - - false - - false - false + + + repo_name + branch_name + recursive + FF_ONLY + + @@ -47,4 +39,4 @@ http://github.com/foo/example.git - \ No newline at end of file + diff --git a/tests/scm/fixtures/gitlab.xml b/tests/scm/fixtures/gitlab.xml index 887ef98c..a78d3342 100644 --- a/tests/scm/fixtures/gitlab.xml +++ b/tests/scm/fixtures/gitlab.xml @@ -14,25 +14,15 @@ origin/master - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/scm/fixtures/local-branch001.xml b/tests/scm/fixtures/local-branch001.xml index 859a26ca..548595c0 100644 --- a/tests/scm/fixtures/local-branch001.xml +++ b/tests/scm/fixtures/local-branch001.xml @@ -14,27 +14,19 @@ master - - false false false - false - true - false false Default - - false - - false - false - master + + master + diff --git a/tests/scm/fixtures/raw001.xml b/tests/scm/fixtures/raw001.xml index 31d69285..46217a67 100644 --- a/tests/scm/fixtures/raw001.xml +++ b/tests/scm/fixtures/raw001.xml @@ -16,25 +16,15 @@ ** - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/scm/fixtures/stash.xml b/tests/scm/fixtures/stash.xml index ea167e5a..60af0ce8 100644 --- a/tests/scm/fixtures/stash.xml +++ b/tests/scm/fixtures/stash.xml @@ -14,25 +14,15 @@ origin/master - - false false false - false - true - false false Default - - false - - false - false diff --git a/tests/yamlparser/fixtures/complete001.xml b/tests/yamlparser/fixtures/complete001.xml index a3fabd2a..c34f622f 100644 --- a/tests/yamlparser/fixtures/complete001.xml +++ b/tests/yamlparser/fixtures/complete001.xml @@ -22,27 +22,21 @@ origin/** - - false false false - false - true - true false Default - - false - - false - false + + + + diff --git a/tests/yamlparser/fixtures/scm_remote_deep_bug.xml b/tests/yamlparser/fixtures/scm_remote_deep_bug.xml index 05575c40..c6a9c9f9 100644 --- a/tests/yamlparser/fixtures/scm_remote_deep_bug.xml +++ b/tests/yamlparser/fixtures/scm_remote_deep_bug.xml @@ -22,25 +22,15 @@ ** - - false false false - false - true - false false Default - - false - - false - false -- cgit