From 872f3c550319df9d69337d4350a250ab0a9586d8 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 9 Jun 2016 14:49:42 -0700 Subject: [PATCH] Revert "Add git shallow fetch test (#16055)" -- Broke integration tests: https://app.shippable.com/runs/57599a7897ae890c00c2898d This reverts commit e81f14ab48c89717c59df4749c674823bc7da56d. --- .../integration/roles/test_git/tasks/main.yml | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/test/integration/roles/test_git/tasks/main.yml b/test/integration/roles/test_git/tasks/main.yml index 2212e43aeed..18eaeffdfec 100644 --- a/test/integration/roles/test_git/tasks/main.yml +++ b/test/integration/roles/test_git/tasks/main.yml @@ -19,7 +19,6 @@ - name: set role facts set_fact: checkout_dir: '{{ output_dir }}/git' - repo_dir: '{{ output_dir }}/local_repos' repo_format1: 'https://github.com/jimi-c/test_role' repo_format2: 'git@github.com:jimi-c/test_role.git' repo_format3: 'ssh://git@github.com/jimi-c/test_role.git' @@ -45,11 +44,6 @@ shell: git --version | grep 'git version' | sed 's/git version //' register: git_version -- name: set dummy git config - shell: git config --global user.email "noreply@example.com"; git config --global user.name "Ansible Test Runner" - -- name: create repo_dir - file: path={{repo_dir}} state=directory # # Test repo=https://github.com/... @@ -601,7 +595,6 @@ dest: '{{ checkout_dir }}' depth: 1 version: master - when: git_version.stdout | version_compare("1.8.2", '>=') - name: switch to older branch with depth=1 (uses fetch) git: @@ -610,51 +603,10 @@ depth: 1 version: earlybranch register: git_fetch - when: git_version.stdout | version_compare("1.8.2", '>=') - name: ensure the fetch succeeded assert: that: git_fetch|success - when: git_version.stdout | version_compare("1.8.2", '>=') - -- name: clear checkout_dir - file: state=absent path={{ checkout_dir }} - -# test for https://github.com/ansible/ansible-modules-core/issues/3782 -# make sure shallow fetch works when no version is specified - -- name: prepare old git repo - shell: git init; echo "1" > a; git add a; git commit -m "1" - args: - chdir: "{{repo_dir}}" - -- name: checkout old repo - git: - repo: '{{ repo_dir }}' - dest: '{{ checkout_dir }}' - depth: 1 - -- name: "update repo" - shell: echo "2" > a; git commit -a -m "2" - args: - chdir: "{{repo_dir}}" - -- name: fetch updated repo - git: - repo: '{{ repo_dir }}' - dest: '{{ checkout_dir }}' - depth: 1 - register: git_fetch - ignore_errors: yes - -- name: read file - shell: cat {{ checkout_dir }}/a - -- name: check update arrived - assert: - that: - - "{{ lookup('file', checkout_dir+'/a' )}} == 2" - - git_fetch|changed - name: clear checkout_dir file: state=absent path={{ checkout_dir }}