Move dependency tests from PreCommit Coverage to PostCommit #30704
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| name: PostCommit Python Dependency | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: '0 5/6 * * *' | ||
| pull_request_target: | ||
| paths: ['release/trigger_all_tests.json', '.github/trigger_files/beam_PostCommit_Python_Dependency.json'] | ||
| workflow_dispatch: | ||
|
|
||
| #Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event | ||
| permissions: | ||
| actions: write | ||
| pull-requests: write | ||
| checks: write | ||
| contents: read | ||
| deployments: read | ||
| id-token: none | ||
| issues: write | ||
| discussions: read | ||
| packages: read | ||
| pages: read | ||
| repository-projects: read | ||
| security-events: read | ||
| statuses: read | ||
|
|
||
| # This allows a subsequently queued workflow run to interrupt previous runs | ||
| concurrency: | ||
| group: '${{ github.workflow }} @ ${{ github.event.issue.number || github.sha || github.head_ref || github.ref }}-${{ github.event.schedule || github.event.comment.id || github.event.sender.login }}' | ||
| cancel-in-progress: true | ||
|
|
||
| env: | ||
| GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} | ||
| GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }} | ||
| GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }} | ||
| HF_INFERENCE_TOKEN: ${{ secrets.HF_INFERENCE_TOKEN }} | ||
|
|
||
|
|
||
| jobs: | ||
| beam_PostCommit_Python_Dependency: | ||
| name: ${{ matrix.job_name }} (${{ matrix.job_phrase }}) | ||
| runs-on: [self-hosted, ubuntu-20.04, main] | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| job_name: [beam_PostCommit_Python_Dependency] | ||
| job_phrase: [Run Python PostCommit Dependency] | ||
| timeout-minutes: 120 | ||
| if: | | ||
| github.event_name == 'workflow_dispatch' || | ||
| github.event_name == 'pull_request_target' || | ||
| (github.event_name == 'schedule' && github.repository == 'apache/beam') || | ||
| github.event.comment.body == 'Run Python PostCommit Dependency' | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Setup repository | ||
| uses: ./.github/actions/setup-action | ||
| with: | ||
| comment_phrase: ${{ matrix.job_phrase }} | ||
| github_token: ${{ secrets.GITHUB_TOKEN }} | ||
| github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }}) | ||
| - name: Setup environment | ||
| uses: ./.github/actions/setup-environment-action | ||
| with: | ||
| java-version: 8 | ||
| python-version: 3.8 | ||
| - name: Run postCommitPyDep | ||
| uses: ./.github/actions/gradle-command-self-hosted-action | ||
| with: | ||
| gradle-command: :sdks:python:test-suites:tox:py38:postCommitPyDep | ||
| arguments: | | ||
| -PuseWheelDistribution | ||
| - name: Archive Python Test Results | ||
| uses: actions/upload-artifact@v4 | ||
| if: failure() | ||
| with: | ||
| name: Python Test Results | ||
| path: '**/pytest*.xml' | ||
| - name: Publish Python Test Results | ||
| uses: EnricoMi/publish-unit-test-result-action@v2 | ||
| if: always() | ||
| with: | ||
| commit: '${{ env.prsha || env.GITHUB_SHA }}' | ||
| comment_mode: ${{ github.event_name == 'issue_comment' && 'always' || 'off' }} | ||
| files: '**/pytest*.xml' | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,76 +44,84 @@ lint.dependsOn mypyPy38 | |
| apply from: "../common.gradle" | ||
|
|
||
|
|
||
| toxTask "testPy38CloudCoverage", "py38-cloudcoverage", "${posargs}" | ||
| test.dependsOn "testPy38CloudCoverage" | ||
| project.tasks.register("preCommitPyCoverage") { | ||
| dependsOn = ["testPy38CloudCoverage"] | ||
| } | ||
|
|
||
| // Dep Postcommit runs test suites that evaluate compatibility of particular | ||
| // dependencies. It is exercised on a single Python version. | ||
| // | ||
| // Should still leave at least one version in PreCommit unless the marked tests | ||
| // are also exercised by existing PreCommit | ||
| // e.g. pyarrow and pandas also run on PreCommit Dataframe and Coverage | ||
| project.tasks.register("postCommitPyDep") {} | ||
|
|
||
| // Create a test task for each supported major version of pyarrow | ||
| toxTask "testPy38pyarrow-3", "py38-pyarrow-3", "${posargs}" | ||
| test.dependsOn "testPy38pyarrow-3" | ||
| postCommitPyDep.dependsOn "testPy38pyarrow-3" | ||
|
|
||
| toxTask "testPy38pyarrow-4", "py38-pyarrow-4", "${posargs}" | ||
| test.dependsOn "testPy38pyarrow-4" | ||
| postCommitPyDep.dependsOn "testPy38pyarrow-4" | ||
|
|
||
| toxTask "testPy38pyarrow-5", "py38-pyarrow-5", "${posargs}" | ||
| test.dependsOn "testPy38pyarrow-5" | ||
| postCommitPyDep.dependsOn "testPy38pyarrow-5" | ||
|
|
||
| toxTask "testPy38pyarrow-6", "py38-pyarrow-6", "${posargs}" | ||
| test.dependsOn "testPy38pyarrow-6" | ||
| postCommitPyDep.dependsOn "testPy38pyarrow-6" | ||
|
|
||
| toxTask "testPy38pyarrow-7", "py38-pyarrow-7", "${posargs}" | ||
| test.dependsOn "testPy38pyarrow-7" | ||
| postCommitPyDep.dependsOn "testPy38pyarrow-7" | ||
|
|
||
| toxTask "testPy38pyarrow-8", "py38-pyarrow-8", "${posargs}" | ||
| test.dependsOn "testPy38pyarrow-8" | ||
| postCommitPyDep.dependsOn "testPy38pyarrow-8" | ||
|
There was a problem hiding this comment. Each of these categories are not strictly dependency tests, they also test some other functionality which is not necessarily tested elsewhere. I agree we don't need the full matrix of all versions in our precommits, but I think it would be good to keep at least 1 version per type that also runs in the precommit. So for example, we could change this line to 2 lines: but leave the rest of the pyarrow versions for the dependency task There was a problem hiding this comment. I thought these tests are also running on usual precommit, with dependency version unrestricted (see comment above). Let me open a draft PR to double check There was a problem hiding this comment. From test result of #30226 Only pyarrow and pandas tests were executed in other PreCommit (PreCommit dataframe), so these two tests can be fully moved to postcommit; other tests leave at least one version in PreCommit coverage |
||
|
|
||
| toxTask "testPy38pyarrow-9", "py38-pyarrow-9", "${posargs}" | ||
| test.dependsOn "testPy38pyarrow-9" | ||
| postCommitPyDep.dependsOn "testPy38pyarrow-9" | ||
|
|
||
| // Create a test task for each minor version of pandas | ||
| toxTask "testPy38pandas-14", "py38-pandas-14", "${posargs}" | ||
| test.dependsOn "testPy38pandas-14" | ||
| postCommitPyDep.dependsOn "testPy38pandas-14" | ||
|
|
||
| toxTask "testPy38pandas-15", "py38-pandas-15", "${posargs}" | ||
| test.dependsOn "testPy38pandas-15" | ||
| postCommitPyDep.dependsOn "testPy38pandas-15" | ||
|
|
||
| toxTask "testPy38pandas-20", "py38-pandas-20", "${posargs}" | ||
| test.dependsOn "testPy38pandas-20" | ||
| postCommitPyDep.dependsOn "testPy38pandas-20" | ||
|
|
||
| // Create a test task for each minor version of pytorch | ||
| toxTask "testPy38pytorch-19", "py38-pytorch-19", "${posargs}" | ||
| test.dependsOn "testPy38pytorch-19" | ||
| postCommitPyDep.dependsOn "testPy38pytorch-19" | ||
|
|
||
| toxTask "testPy38pytorch-110", "py38-pytorch-110", "${posargs}" | ||
| test.dependsOn "testPy38pytorch-110" | ||
| postCommitPyDep.dependsOn "testPy38pytorch-110" | ||
|
|
||
| toxTask "testPy38pytorch-111", "py38-pytorch-111", "${posargs}" | ||
| test.dependsOn "testPy38pytorch-111" | ||
| postCommitPyDep.dependsOn "testPy38pytorch-111" | ||
|
|
||
| toxTask "testPy38pytorch-112", "py38-pytorch-112", "${posargs}" | ||
| test.dependsOn "testPy38pytorch-112" | ||
| postCommitPyDep.dependsOn "testPy38pytorch-112" | ||
|
|
||
| toxTask "testPy38pytorch-113", "py38-pytorch-113", "${posargs}" | ||
| test.dependsOn "testPy38pytorch-113" | ||
| postCommitPyDep.dependsOn "testPy38pytorch-113" | ||
|
|
||
| // run on precommit | ||
| toxTask "testPy38pytorch-200", "py38-pytorch-200", "${posargs}" | ||
| test.dependsOn "testPy38pytorch-200" | ||
| preCommitPyCoverage.dependsOn "testPy38pytorch-200" | ||
|
|
@@ -126,7 +134,7 @@ preCommitPyCoverage.dependsOn "testPy38tft-113" | |
| // Create a test task for each minor version of onnx | ||
| // toxTask "testPy38onnx-113", "py38-onnx-113", "${posargs}" | ||
| // test.dependsOn "testPy38onnx-113" | ||
| // postCommitPyDep.dependsOn "testPy38onnx-113" | ||
| // Create a test task for each minor version of tensorflow | ||
| toxTask "testPy38tensorflow-212", "py38-tensorflow-212", "${posargs}" | ||
| test.dependsOn "testPy38tensorflow-212" | ||
|
|
@@ -135,12 +143,13 @@ preCommitPyCoverage.dependsOn "testPy38tensorflow-212" | |
| // Create a test task for each minor version of transformers | ||
| toxTask "testPy38transformers-428", "py38-transformers-428", "${posargs}" | ||
| test.dependsOn "testPy38transformers-428" | ||
| postCommitPyDep.dependsOn "testPy38transformers-428" | ||
|
|
||
| toxTask "testPy38transformers-429", "py38-transformers-429", "${posargs}" | ||
| test.dependsOn "testPy38transformers-429" | ||
| postCommitPyDep.dependsOn "testPy38transformers-429" | ||
|
|
||
| // run on precommit | ||
| toxTask "testPy38transformers-430", "py38-transformers-430", "${posargs}" | ||
| test.dependsOn "testPy38transformers-430" | ||
| preCommitPyCoverage.dependsOn "testPy38transformers-430" | ||
|
|
@@ -153,8 +162,9 @@ preCommitPyCoverage.dependsOn "testPy38embeddingsMLTransform" | |
| // mutliple versions so keeping this suite separate. | ||
| toxTask "testPy38TensorflowHubEmbeddings-014", "py38-TFHubEmbeddings-014", "${posargs}" | ||
| test.dependsOn "testPy38TensorflowHubEmbeddings-014" | ||
| postCommitPyDep.dependsOn "testPy38TensorflowHubEmbeddings-014" | ||
|
|
||
| // run on precommit | ||
| toxTask "testPy38TensorflowHubEmbeddings-015", "py38-TFHubEmbeddings-015", "${posargs}" | ||
| test.dependsOn "testPy38TensorflowHubEmbeddings-015" | ||
| preCommitPyCoverage.dependsOn "testPy38TensorflowHubEmbeddings-015" | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for making this change. Do we still need to explicitly mention new suites anywhere under release/src/main/scripts or this is no longer necessary?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not necessary. job_phrase for postcommit currently is not effective (#28909). I just copy-paste from existing yml which had this structure.