From: Nicola Tuveri <nic.tuv@gmail.com>
Date: Tue, 17 Aug 2021 10:03:56 +0000 (+0300)
Subject: Revert "[github-ci][ci.yml] Disable pyca external tests"
X-Git-Tag: OpenSSL_1_1_1o~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25f4bf08c71a81d0a8a50f89a344d8013b55716c;p=thirdparty%2Fopenssl.git

Revert "[github-ci][ci.yml] Disable pyca external tests"

This reverts commit 850ed18505631286abbd23d355d4b48f28ad89a9.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16340)
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 367b8cf41fe..f4d0a005879 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -249,36 +249,35 @@ jobs:
 #    - name: test external krb5
 #      run: make test TESTS="test_external_krb5" VERBOSE=1
 
-# pyca testing temporarily disabled due to failures to be investigated separately
-#  external-test-pyca:
-#    runs-on: ubuntu-latest
-#    strategy:
-#      matrix:
-#        RUST:
-#        - 1.51.0
-#        PYTHON:
-#        - 3.9
-#    steps:
-#    - uses: actions/checkout@v2
-#      with:
-#        submodules: recursive
-#    - name: package installs
-#      run: |
-#        sudo apt-get update
-#        sudo apt-get -yq install python3-virtualenv virtualenv
-#    - name: Configure OpenSSL
-#      run: ./config --strict-warnings --debug enable-external-tests && perl configdata.pm --dump
-#    - name: make
-#      run: make -s -j4
-#    - name: Setup Python
-#      uses: actions/setup-python@v2.2.2
-#      with:
-#        python-version: ${{ matrix.PYTHON }}
-#    - uses: actions-rs/toolchain@v1
-#      with:
-#        profile: minimal
-#        toolchain: ${{ matrix.RUST }}
-#        override: true
-#        default: true
-#    - name: test external pyca
-#      run: make test TESTS="test_external_pyca" VERBOSE=1
+  external-test-pyca:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        RUST:
+        - 1.51.0
+        PYTHON:
+        - 3.9
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - name: package installs
+      run: |
+        sudo apt-get update
+        sudo apt-get -yq install python3-virtualenv virtualenv
+    - name: Configure OpenSSL
+      run: ./config --strict-warnings --debug enable-external-tests && perl configdata.pm --dump
+    - name: make
+      run: make -s -j4
+    - name: Setup Python
+      uses: actions/setup-python@v2.2.2
+      with:
+        python-version: ${{ matrix.PYTHON }}
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: ${{ matrix.RUST }}
+        override: true
+        default: true
+    - name: test external pyca
+      run: make test TESTS="test_external_pyca" VERBOSE=1