mononoke/integration tests: fix issue with missing dulwich for hggit ext

facebook · Sep 18, 2020 · 5262b4a · 5262b4a
1 parent 755a37a
commit 5262b4a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/.github/workflows/mononoke-integration_linux.yml b/.github/workflows/mononoke-integration_linux.yml
@@ -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
@@ -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
diff --git a/.github/workflows/mononoke-integration_mac.yml b/.github/workflows/mononoke-integration_mac.yml
@@ -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
@@ -76,19 +80,25 @@ 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: >-
+        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;
+        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
diff --git a/eden/mononoke/tests/integration/run_tests_getdeps.py b/eden/mononoke/tests/integration/run_tests_getdeps.py
@@ -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