Try to run fewer CI jobs, more efficiently

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
nexB · Mar 12, 2022 · 8e264cb · 8e264cb
1 parent 37bc3f2
commit 8e264cb
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 92 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -17,24 +17,16 @@ jobs:
           image_name: ubuntu-20.04
           python_versions: ['3.8']
           test_suites:
-              misc: |
-                venv/bin/pytest -n 3 -vvs --test-suite=all \
-                  --ignore=tests/scancode \
-                  --ignore=tests/cluecode \
-                  --ignore=tests/licensedcode
-
-              scancode: |
+              misc_and_scancode: |
                # cli tests are launched below on all OSes
-                venv/bin/pytest -vvs --test-suite=all \
-                  --ignore=tests/scancode/test_cli.py \
-                  tests/scancode
-
-              cluecode: |
                 venv/bin/pytest -n 3 -vvs --test-suite=all \
-                  tests/cluecode
+                  --ignore=tests/cluecode \
+                  --ignore=tests/licensedcode \
+                  --ignore=tests/scancode/test_cli.py
 
-              license_base: |
+              cluecode_license_base: |
                 venv/bin/pytest -n 3 -vvs --test-suite=all \
+                  tests/cluecode \
                   --ignore=tests/licensedcode/test_zzzz_cache.py \
                   --ignore=tests/licensedcode/test_detection_datadriven_external.py \
                   --ignore=tests/licensedcode/test_detection_datadriven1.py \
@@ -43,20 +35,14 @@ jobs:
                   --ignore=tests/licensedcode/test_detection_datadriven4.py \
                   tests/licensedcode
 
-              license_datadriven1: |
-                venv/bin/pytest -n 3 -vvs --test-suite=all \
-                  tests/licensedcode/test_detection_datadriven1.py
-
-              license_datadriven2: |
+              license_datadriven1_2: |
                 venv/bin/pytest -n 3 -vvs --test-suite=all \
+                  tests/licensedcode/test_detection_datadriven1.py \
                   tests/licensedcode/test_detection_datadriven2.py
 
-              license_datadriven3: |
-                venv/bin/pytest -n 3 -vvs --test-suite=all \
-                  tests/licensedcode/test_detection_datadriven3.py
-
-              license_datadriven4: |
+              license_datadriven3_4: |
                 venv/bin/pytest -n 3 -vvs --test-suite=all \
+                  tests/licensedcode/test_detection_datadriven3.py \
                   tests/licensedcode/test_detection_datadriven4.py
 
               license_datadriven_ext: |
@@ -290,28 +276,6 @@ jobs:
 #          test_suite: venv/bin/pytest -n 2 -vvs
 
 
-########################################################################
-# RELEASE on 3.6. Also check that we can pip install
-########################################################################
-#
-#    - job: Build_release_archive_py3
-#      pool:
-#          vmImage: ubuntu-18.04
-#      steps:
-#          - checkout: self
-#            fetchDepth: 10
-#
-#          - task: UsePythonVersion@0
-#            inputs:
-#                versionSpec: '3.6'
-#            displayName: 'Install Python 3.6'
-#
-#          - script: ./etc/release/scancode-test-pip-install.sh
-#            displayName: 'Test pip wheel installation'
-#
-#          - script: ./etc/release/scancode-test-pip-install-editable.sh
-#            displayName: 'Test pip editable installation'
-
 ################################################################################
 # Tests using a plain pip install to get the latest of all wheels
 ################################################################################
@@ -323,44 +287,77 @@ jobs:
           image_name: ubuntu-18.04
           python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
           test_suites:
-              all: venv/bin/pip install --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
+              all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
 
     - template: etc/ci/azure-posix.yml
       parameters:
           job_name: ubuntu20_cpython_latest_from_pip
           image_name: ubuntu-20.04
           python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
           test_suites:
-              all: venv/bin/pip install --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
+              all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
 
     - template: etc/ci/azure-posix.yml
       parameters:
-          job_name: macos1015_cpython_latest_from_pip
+          job_name: macos1015_cpython_latest_from_pip1
           image_name: macos-10.15
-          python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
+          python_versions: ['3.6', '3.7']
+          test_suites:
+              all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
+
+    - template: etc/ci/azure-posix.yml
+      parameters:
+          job_name: macos1015_cpython_latest_from_pip2
+          image_name: macos-10.15
+          python_versions: ['3.8', '3.9', '3.10']
           test_suites:
-              all: venv/bin/pip install --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
+              all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
 
     - template: etc/ci/azure-posix.yml
       parameters:
-          job_name: macos11_cpython_latest_from_pip
+          job_name: macos11_cpython_latest_from_pip1
           image_name: macos-11
-          python_versions: ['3.7', '3.8', '3.9', '3.10']
+          python_versions: ['3.7', '3.8', ]
+          test_suites:
+              all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
+
+    - template: etc/ci/azure-posix.yml
+      parameters:
+          job_name: macos11_cpython_latest_from_pip2
+          image_name: macos-11
+          python_versions: ['3.9', '3.10']
           test_suites:
-              all: venv/bin/pip install --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
+              all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
 
     - template: etc/ci/azure-win.yml
       parameters:
-          job_name: win2019_cpython_latest_from_pip
+          job_name: win2019_cpython_latest_from_pip1
           image_name: windows-2019
-          python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
+          python_versions: ['3.6', '3.7']
           test_suites:
-              all: venv\Scripts\pip install --force-reinstall --upgrade -e .[dev] &&  venv\Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
+              all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] &&  venv\Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
 
     - template: etc/ci/azure-win.yml
       parameters:
-          job_name: win2022_cpython_latest_from_pip
+          job_name: win2019_cpython_latest_from_pip2
+          image_name: windows-2019
+          python_versions: ['3.8', '3.9', '3.10']
+          test_suites:
+              all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] &&  venv\Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
+
+    - template: etc/ci/azure-win.yml
+      parameters:
+          job_name: win2022_cpython_latest_from_pip1
           image_name: windows-2022
-          python_versions: ['3.7', '3.8', '3.9', '3.10']
+          python_versions: ['3.7', '3.8']
           test_suites:
-              all: venv\Scripts\pip install --force-reinstall --upgrade -e .[dev] &&  venv\Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
+              all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] &&  venv\Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
+
+    - template: etc/ci/azure-win.yml
+      parameters:
+          job_name: win2022_cpython_latest_from_pip2
+          image_name: windows-2022
+          python_versions: ['3.9', '3.10']
+          test_suites:
+              all: venv\Scripts\pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] &&  venv\Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
+
diff --git a/etc/ci/azure-posix.yml b/etc/ci/azure-posix.yml
@@ -13,30 +13,27 @@ jobs:
 
       strategy:
           matrix:
-            ${{ each pyver in parameters.python_versions }}:
               ${{ each tsuite in parameters.test_suites }}:
-                 ${{ format('py{0} {1}', pyver, tsuite.key) }}:
-                     python_version: ${{ pyver }}
+                 ${{ tsuite.key }}:
                      test_suite_label: ${{ tsuite.key }}
                      test_suite: ${{ tsuite.value }}
 
       steps:
           - checkout: self
             fetchDepth: 10
 
-          - task: UsePythonVersion@0
-            inputs:
-                versionSpec: '$(python_version)'
-                architecture: '${{ parameters.python_architecture }}'
-            displayName: 'Install Python $(python_version)'
+          - ${{ each pyver in parameters.python_versions }}:
+              - task: UsePythonVersion@0
+                inputs:
+                    versionSpec: '${{ pyver }}'
+                    architecture: '${{ parameters.python_architecture }}'
+                displayName: '${{ pyver }} - Install Python'
 
-          - script: |
-                python --version
-                python3 --version
-                python$(python_version) --version
-                echo "python$(python_version)" > PYTHON_EXECUTABLE
-                ./configure --dev
-            displayName: 'Run Configure'
+              - script: |
+                    python${{ pyver }} --version
+                    echo "python${{ pyver }}" > PYTHON_EXECUTABLE
+                    ./configure --clean && configure --dev
+                displayName: '${{ pyver }} - Configure'
 
-          - script: $(test_suite)
-            displayName: 'Run $(test_suite_label) tests with py$(python_version) on ${{ parameters.job_name }}'
+              - script: $(test_suite)
+                displayName: '${{ pyver }} - $(test_suite_label) on ${{ parameters.job_name }}'
diff --git a/etc/ci/azure-win.yml b/etc/ci/azure-win.yml
@@ -13,27 +13,27 @@ jobs:
 
       strategy:
           matrix:
-            ${{ each pyver in parameters.python_versions }}:
               ${{ each tsuite in parameters.test_suites }}:
-                 ${{ format('py{0} {1}', pyver, tsuite.key) }}:
-                     python_version: ${{ pyver }}
+                 ${{ tsuite.key }}:
                      test_suite_label: ${{ tsuite.key }}
                      test_suite: ${{ tsuite.value }}
+
       steps:
           - checkout: self
             fetchDepth: 10
 
-          - task: UsePythonVersion@0
-            inputs:
-                versionSpec: '$(python_version)'
-                architecture: '${{ parameters.python_architecture }}'
-            displayName: 'Install Python $(python_version)'
+          - ${{ each pyver in parameters.python_versions }}:
+              - task: UsePythonVersion@0
+                inputs:
+                    versionSpec: '${{ pyver }}'
+                    architecture: '${{ parameters.python_architecture }}'
+                displayName: '${{ pyver }} - Install Python'
 
-          - script: |
-               python --version
-               echo | set /p=python> PYTHON_EXECUTABLE
-               configure --dev
-            displayName: 'Run Configure'
+              - script: |
+                   python --version
+                   echo | set /p=python> PYTHON_EXECUTABLE
+                   configure --clean && configure --dev
+                displayName: '${{ pyver }} - Configure'
 
-          - script: $(test_suite)
-            displayName: 'Run $(test_suite_label) tests with py$(python_version) on ${{ parameters.job_name }}'
+              - script: $(test_suite)
+                displayName: '${{ pyver }} - $(test_suite_label) on ${{ parameters.job_name }}'