Skip to content

Commit cbdf30b

Browse files
authored
[YAML]: fix postcommit oracle bug and reorganize postcommit tests (#35191)
* fix postcommit oracle test * add revision * switch to hosted runner to try with kafka test * add extended timeout * upgrade to 4.10 testcontainers * switch out to redpanda for kafka * remove redpandacontainer * tmp comment * add postgres comment * revert to old kafkaContainer * revert commented out code and revert testcontainer version change * change mysql image version * revert image change * revert image change again :) * add comments to mysql again * shift post commit files to different folders * rename to Data version * add databases version * add messaging version * update readme for three post commits * update gradle with new post commits * fix job names * uncomment fixture on mysql * switch back to one workflow and update readme as such * remove old workflow files * update order and remove comment * update gradle with parameterized options * update gradle command calls to correct location * update workflow to three jobs explicit * add back Bigquery deselect * fix mysql teardown error * Simplify down to one from three explicit jobs * remove tab * remove Data * fix parsing parameters
1 parent b43726a commit cbdf30b

File tree

16 files changed

+40
-18
lines changed

16 files changed

+40
-18
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run",
3-
"revision": 1
3+
"revision": 2
44
}

.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,22 @@ jobs:
5454
github.event_name == 'workflow_dispatch' ||
5555
github.event_name == 'pull_request_target' ||
5656
(github.event_name == 'schedule' && github.repository == 'apache/beam')
57-
runs-on: [self-hosted, ubuntu-20.04, main]
57+
runs-on: ubuntu-latest
5858
timeout-minutes: 100
5959
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
6060
strategy:
6161
matrix:
6262
job_name: ["beam_PostCommit_Yaml_Xlang_Direct"]
6363
job_phrase: ["Run Yaml_Xlang_Direct PostCommit"]
64+
test_set: ["data", "databases", "messaging"]
6465
steps:
6566
- uses: actions/checkout@v4
6667
- name: Setup repository
6768
uses: ./.github/actions/setup-action
6869
with:
69-
comment_phrase: ${{ matrix.job_phrase }}
70+
comment_phrase: ${{ matrix.job_phrase }} ${{ matrix.test_set }}
7071
github_token: ${{ secrets.GITHUB_TOKEN }}
71-
github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
72+
github_job: ${{ matrix.job_name }} ${{ matrix.test_set }} (${{ matrix.job_phrase }} ${{ matrix.test_set }})
7273
- name: Setup environment
7374
uses: ./.github/actions/setup-environment-action
7475
with:
@@ -79,7 +80,7 @@ jobs:
7980
- name: run PostCommit Yaml Xlang Direct script
8081
uses: ./.github/actions/gradle-command-self-hosted-action
8182
with:
82-
gradle-command: :sdks:python:postCommitYamlIntegrationTests -PbeamPythonExtra=ml_test
83+
gradle-command: :sdks:python:postCommitYamlIntegrationTests -PyamlTestSet=${{ matrix.test_set }} -PbeamPythonExtra=ml_test
8384
- name: Archive Python Test Results
8485
uses: actions/upload-artifact@v4
8586
if: failure()
@@ -93,4 +94,5 @@ jobs:
9394
commit: '${{ env.prsha || env.GITHUB_SHA }}'
9495
comment_mode: ${{ github.event_name == 'issue_comment' && 'always' || 'off' }}
9596
files: '**/pytest*.xml'
96-
large_files: true
97+
large_files: true
98+

sdks/python/apache_beam/yaml/extended_tests/enrichment.yaml renamed to sdks/python/apache_beam/yaml/extended_tests/data/enrichment.yaml

File renamed without changes.

sdks/python/apache_beam/yaml/extended_tests/tfrecord.yaml renamed to sdks/python/apache_beam/yaml/extended_tests/data/tfrecord.yaml

File renamed without changes.

sdks/python/apache_beam/yaml/extended_tests/bigquery.yaml renamed to sdks/python/apache_beam/yaml/extended_tests/databases/bigquery.yaml

File renamed without changes.

sdks/python/apache_beam/yaml/extended_tests/jdbc.yaml renamed to sdks/python/apache_beam/yaml/extended_tests/databases/jdbc.yaml

File renamed without changes.

sdks/python/apache_beam/yaml/extended_tests/mysql.yaml renamed to sdks/python/apache_beam/yaml/extended_tests/databases/mysql.yaml

File renamed without changes.

sdks/python/apache_beam/yaml/extended_tests/oracle.yaml renamed to sdks/python/apache_beam/yaml/extended_tests/databases/oracle.yaml

File renamed without changes.

sdks/python/apache_beam/yaml/extended_tests/postgres.yaml renamed to sdks/python/apache_beam/yaml/extended_tests/databases/postgres.yaml

File renamed without changes.

sdks/python/apache_beam/yaml/extended_tests/spanner.yaml renamed to sdks/python/apache_beam/yaml/extended_tests/databases/spanner.yaml

File renamed without changes.

0 commit comments

Comments
 (0)