Merge pull request #37 from chrisburr/py3-server-int

Run server integration tests for Python 3

Author: chrisburr

.github/workflows/build-and-test.yml

@@ -132,8 +132,8 @@ jobs:
       - name: Run tests
         run: scripts/run_basic_tests.sh ${{ matrix.docker-image }} DIRACOS-*.sh
 
-  integration-tests:
-    name: Integration tests
+  integration-tests-client-only:
+    name: Integration tests (Py2 server)
     if: github.repository == 'DIRACGrid/DIRACOS2'
     needs: build-installer
     runs-on: ubuntu-latest
@@ -164,3 +164,35 @@ jobs:
           ./integration_tests.py create \
             "CLIENT_DIRACOS_TARBALL_PATH=${CLIENT_DIRACOS_TARBALL_PATH}" \
             "CLIENT_USE_PYTHON3=Yes"
+
+  integration-tests-client-and-server:
+    name: Integration tests (Py3 server)
+    if: github.repository == 'DIRACGrid/DIRACOS2'
+    needs: build-installer
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        dirac-branch:
+          - integration
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.9'
+      - name: Download installer
+        uses: actions/download-artifact@v2
+        with:
+          name: installer-linux-64
+      - name: Prepare environment
+        run: |
+          pip install typer pyyaml gitpython packaging
+          git clone https://github.com/DIRACGrid/DIRAC.git -b "${{ matrix.dirac-branch }}" DIRACRepo
+      - name: Run tests
+        run: |
+          DIRACOS_TARBALL_PATH=$(echo ${PWD}/DIRACOS-*.sh)
+          echo "DIRACOS_TARBALL_PATH is ${DIRACOS_TARBALL_PATH}"
+          cd DIRACRepo
+          ./integration_tests.py create \
+            "DIRACOS_TARBALL_PATH=${DIRACOS_TARBALL_PATH}" \
+            "USE_PYTHON3=Yes"