From: Eric Ball <eball@linuxfoundation.org>
Date: Wed, 14 Feb 2024 01:17:45 +0000 (-0800)
Subject: CI: Use the tox-verify workflow to test all envs
X-Git-Tag: v0.90.1~6^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=0ff7cbacb76c80c8e2222;p=releng%2Fglobal-jjb.git

CI: Use the tox-verify workflow to test all envs

The previous tox CI config was not running "docs", which is not part
of the envlist. We will now run all necessary envs.

Due to how the tox-verify workflow functions, pre-commit no longer
needs to be separated out. All envs will be run in parallel.

Issue: RELENG-5138
Change-Id: I2c5e732b4fd0a28c800d7a3819fb8fb32a29e5fd
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml
index 84fded09..fba65056 100644
--- a/.github/workflows/gerrit-verify.yaml
+++ b/.github/workflows/gerrit-verify.yaml
@@ -63,36 +63,22 @@ jobs:
       - name: Allow replication
         run: sleep 10s
 
-  # run pre-commit tox env separately to get use of more parallel processing
-  pre-commit:
+  tox-verify:
     needs: prepare
-    runs-on: ubuntu-latest
-    steps:
-      - uses: lfit/checkout-gerrit-change-action@v0.2
-        with:
-          gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
-          delay: "0s"
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-      - name: Run static analysis and format checkers
-        run: pipx run tox -e pre-commit
-
-  tox:
-    needs: prepare
-    runs-on: ubuntu-latest
-    steps:
-      - uses: lfit/checkout-gerrit-change-action@v0.2
-        with:
-          gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
-          delay: "0s"
-      - uses: actions/setup-python@v4
-        id: setup-python
-        with:
-          python-version: "3.11"
-      - name: Run tests
-        run: >-
-          TOX_SKIP_ENV=pre-commit pipx run tox
+    # yamllint disable-line rule:line-length
+    uses: lfit/releng-reusable-workflows/.github/workflows/gerrit-compose-required-tox-verify.yaml@fbf2b4bcca9a6306765f39552d8cfcd962ab6945 # v0.2.1
+    with:
+      GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }}
+      GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }}
+      GERRIT_CHANGE_NUMBER: ${{ inputs.GERRIT_CHANGE_NUMBER }}
+      GERRIT_CHANGE_URL: ${{ inputs.GERRIT_CHANGE_URL }}
+      GERRIT_EVENT_TYPE: ${{ inputs.GERRIT_EVENT_TYPE }}
+      GERRIT_PATCHSET_NUMBER: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
+      GERRIT_PATCHSET_REVISION: ${{ inputs.GERRIT_PATCHSET_REVISION }}
+      GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }}
+      GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }}
+      # yamllint disable-line rule:line-length
+      TOX_ENVS: '["ensure-documented", "jjb", "jjb-compare-xml", "license", "bashate", "pre-commit", "docs"]'
 
   vote:
     if: ${{ always() }}