Skip to content

Commit

Permalink
mononoke/integration tests: fix issue with missing dulwich for hggit …
Browse files Browse the repository at this point in the history
…ext (#59)

Summary: Pull Request resolved: #59

Differential Revision: D23783095

Pulled By: lukaspiatkowski

fbshipit-source-id: 6001c1cab895ae7711c148d4228141ffc3295acd
  • Loading branch information
lukaspiatkowski authored and facebook-github-bot committed Sep 18, 2020
1 parent edef61a commit db7aa67
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 16 deletions.
24 changes: 18 additions & 6 deletions .github/workflows/mononoke-integration_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: '2.7'
- name: Install Python 2 dependencies
run: |
python -m pip install --upgrade pip
pip install "dulwich==0.18.6"
- name: Install Apt-get dependencies
run: |
sudo apt-get install nmap tree
Expand Down Expand Up @@ -100,19 +104,27 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: '3.7'
- name: Install Python dependencies
- name: Install Python 3 dependencies
run: |
python -m pip install --upgrade pip
pip install click
- name: Check space before running tests
run: df -h
- name: Run Monononke integration tests
run: |
python3 eden/mononoke/tests/integration/run_tests_getdeps.py /tmp/build/installed /tmp/build/build/mononoke_integration_test
run: >-
PYTHONPATH="$PYTHONPATH:/opt/hostedtoolcache/Python/2.7.18/x64/lib/python2.7/site-packages"
python3
eden/mononoke/tests/integration/run_tests_getdeps.py
/tmp/build/installed
/tmp/build/build/mononoke_integration_test
continue-on-error: true
- name: Check space after running tests
run: df -h
- name: Rerun failed Monononke integration tests (reduce flakiness)
run: |
cat eden/mononoke/tests/integration/.test* || true
python3 eden/mononoke/tests/integration/run_tests_getdeps.py /tmp/build/installed /tmp/build/build/mononoke_integration_test --rerun-failed
run: >-
cat eden/mononoke/tests/integration/.test* || true;
PYTHONPATH="$PYTHONPATH:/opt/hostedtoolcache/Python/2.7.18/x64/lib/python2.7/site-packages"
python3
eden/mononoke/tests/integration/run_tests_getdeps.py
/tmp/build/installed /tmp/build/build/mononoke_integration_test
--rerun-failed
28 changes: 20 additions & 8 deletions .github/workflows/mononoke-integration_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: '2.7'
- name: Install Python 2 dependencies
run: |
python -m pip install --upgrade pip
pip install "dulwich==0.18.6"
- name: Install Brew dependencies
run: |
brew install bash coreutils curl-openssl gnu-sed grep jq nmap tree
Expand Down Expand Up @@ -76,19 +80,27 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: '3.7'
- name: Install Python dependencies
- name: Install Python 3 dependencies
run: |
python -m pip install --upgrade pip
pip install click
- name: Check space
run: df -h
- name: Run Monononke integration tests
run: |
export PATH="/usr/local/opt/curl-openssl/bin:$PATH"
python3 eden/mononoke/tests/integration/run_tests_getdeps.py /tmp/build/installed /tmp/build/build/mononoke_integration_test
run: >-
export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
PYTHONPATH="$PYTHONPATH:/opt/hostedtoolcache/Python/2.7.18/x64/lib/python2.7/site-packages"
python3
eden/mononoke/tests/integration/run_tests_getdeps.py
/tmp/build/installed
/tmp/build/build/mononoke_integration_test
continue-on-error: true
- name: Rerun failed Monononke integration tests (reduce flakiness)
run: |
cat eden/mononoke/tests/integration/.test* || true
export PATH="/usr/local/opt/curl-openssl/bin:$PATH"
python3 eden/mononoke/tests/integration/run_tests_getdeps.py /tmp/build/installed /tmp/build/build/mononoke_integration_test --rerun-failed
run: >-
cat eden/mononoke/tests/integration/.test* || true;
export PATH="/usr/local/opt/curl-openssl/bin:$PATH";
PYTHONPATH="$PYTHONPATH:/opt/hostedtoolcache/Python/2.7.18/x64/lib/python2.7/site-packages"
python3
eden/mononoke/tests/integration/run_tests_getdeps.py
/tmp/build/installed /tmp/build/build/mononoke_integration_test
--rerun-failed
2 changes: 0 additions & 2 deletions eden/mononoke/tests/integration/run_tests_getdeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ def get_test_groups(repo_root):
},
TestGroup.BROKEN: {
"test-fastreplay-inline-args.t", # Returns different data in OSS
"test-gitimport.t", # Issue with hggit extension
"test-hook-tailer.t", # Issue with hggit extension
"test-remotefilelog-lfs-client-certs.t", # Returns different data in OSS
"test-server.t", # Returns different data in OSS
"test-unbundle-replay-hg-recording.t", # Returns different data in OSS
Expand Down

0 comments on commit db7aa67

Please sign in to comment.