From 59bad647b63b79019ae2cb50eec662bc37af04a1 Mon Sep 17 00:00:00 2001 From: Robin Roth Date: Wed, 20 Apr 2016 09:52:02 +0200 Subject: [PATCH] Revert "Disable new git tests until a fix for rhel6/7 is merged." This reverts commit 197d3dfe9787476eb60169757c71f0acb6e68256. --- .../integration/roles/test_git/tasks/main.yml | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/test/integration/roles/test_git/tasks/main.yml b/test/integration/roles/test_git/tasks/main.yml index e58c2fe2d47..18eaeffdfec 100644 --- a/test/integration/roles/test_git/tasks/main.yml +++ b/test/integration/roles/test_git/tasks/main.yml @@ -596,22 +596,17 @@ depth: 1 version: master -### Commented out while @robinro figures out the best fix to the git module. -### Probably going to disable depth for this operation when on older vresions -### of git to address it (of what we test, currently only rhel6/7 are broken -### (fedora and ubuntu12+ work) - -#- name: switch to older branch with depth=1 (uses fetch) -# git: -# repo: '{{ repo_depth_url }}' -# dest: '{{ checkout_dir }}' -# depth: 1 -# version: earlybranch -# register: git_fetch -# -#- name: ensure the fetch succeeded -# assert: -# that: git_fetch|success +- name: switch to older branch with depth=1 (uses fetch) + git: + repo: '{{ repo_depth_url }}' + dest: '{{ checkout_dir }}' + depth: 1 + version: earlybranch + register: git_fetch + +- name: ensure the fetch succeeded + assert: + that: git_fetch|success - name: clear checkout_dir file: state=absent path={{ checkout_dir }}