From feb40a85b1a581795fe78a4bc8015ae5637f2cb5 Mon Sep 17 00:00:00 2001 From: Marco Robles Date: Tue, 20 Sep 2022 14:08:50 -0500 Subject: [PATCH 1/4] add runner portability python spark --- ...ommit-python-runners-portability-spark.yml | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 .github/workflows/job-precommit-python-runners-portability-spark.yml diff --git a/.github/workflows/job-precommit-python-runners-portability-spark.yml b/.github/workflows/job-precommit-python-runners-portability-spark.yml new file mode 100644 index 000000000000..bbdc632b0aaf --- /dev/null +++ b/.github/workflows/job-precommit-python-runners-portability-spark.yml @@ -0,0 +1,84 @@ +# 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. + +# Test for Python Precommit Runners Portability Spark + + +name: Python Precommit Runners Portability Spark +on: + workflow_dispatch: + schedule: + - cron: '0 */6 * * *' + push: + branches: ['master', 'release-*'] + tags: ['v*'] + pull_request: + branches: ['master', 'release-*'] + tags: ['v*'] + #paths: ['sdks/python/apache_beam/examples/**', + # 'sdks/python/apache_beam/examples/**'] +permissions: read-all + +env: + tests: "'apache_beam/runners/portability/spark_runner.py \ + apache_beam/runners/portability/spark_runner_test.py \ + apache_beam/runners/portability/spark_uber_jar_job_server.py \ + apache_beam/runners/portability/spark_uber_jar_job_server_test.py'" + +jobs: + set-properties: + runs-on: self-hosted + outputs: + properties: ${{ steps.test-properties.outputs.properties }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + with: + persist-credentials: false + submodules: recursive + - id: test-properties + uses: ./.github/actions/setup-default-test-properties + + runners_portability_spark: + needs: set-properties + name: Python Runners Portability Spark + runs-on: self-hosted + strategy: + fail-fast: false + matrix: + version: ${{fromJson(needs.set-properties.outputs.properties).PythonTestProperties.ALL_SUPPORTED_VERSIONS}} + steps: + - name: Checkout code + uses: actions/checkout@v3 + with: + persist-credentials: false + submodules: recursive + - name: Set python version and tox env + run: | + echo "PYTHON_VERSION=$(echo ${{ matrix.version }} | sed -e 's/\.//g')" >> $GITHUB_ENV + - name: Setup environment + uses: ./.github/actions/setup-self-hosted-action + - name: Run :sdks:python:test-suites:tox:${{ env.PYTHON_VERSION }}:testPy${{ env.PYTHON_VERSION }}Cloud + uses: ./.github/actions/gradle-command-self-hosted-action + with: + gradle-command: :sdks:python:test-suites:tox:py${{ env.PYTHON_VERSION }}:testPy${{ env.PYTHON_VERSION }}Cloud + arguments: "-Pposargs=${{env.tests}}" + - name: Run :sdks:python:test-suites:tox:y${{ env.PYTHON_VERSION }}:testPy${{ env.PYTHON_VERSION }}Cython + uses: ./.github/actions/gradle-command-self-hosted-action + with: + gradle-command: :sdks:python:test-suites:tox:py${{ env.PYTHON_VERSION }}:testPy${{ env.PYTHON_VERSION }}Cython + arguments: "-Pposargs=${{env.tests}}" \ No newline at end of file From 6653c7ba7cf31b19b997dce73136c61ba253f32f Mon Sep 17 00:00:00 2001 From: Marco Robles Date: Sat, 24 Sep 2022 11:04:45 -0500 Subject: [PATCH 2/4] update spark job --- ...-precommit-python-runners-portability-spark.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/job-precommit-python-runners-portability-spark.yml b/.github/workflows/job-precommit-python-runners-portability-spark.yml index bbdc632b0aaf..6383c57acebe 100644 --- a/.github/workflows/job-precommit-python-runners-portability-spark.yml +++ b/.github/workflows/job-precommit-python-runners-portability-spark.yml @@ -26,11 +26,17 @@ on: push: branches: ['master', 'release-*'] tags: ['v*'] + paths: [ 'sdks/python/apache_beam/runners/portability/spark_runner.py', + 'sdks/python/apache_beam/runners/portability/spark_runner_test.py', + 'sdks/python/apache_beam/runners/portability/spark_uber_jar_job_server.py', + 'sdks/python/apache_beam/runners/portability/spark_uber_jar_job_server_test.py' ] pull_request: branches: ['master', 'release-*'] tags: ['v*'] - #paths: ['sdks/python/apache_beam/examples/**', - # 'sdks/python/apache_beam/examples/**'] + paths: ['sdks/python/apache_beam/runners/portability/spark_runner.py', + 'sdks/python/apache_beam/runners/portability/spark_runner_test.py', + 'sdks/python/apache_beam/runners/portability/spark_uber_jar_job_server.py', + 'sdks/python/apache_beam/runners/portability/spark_uber_jar_job_server_test.py'] permissions: read-all env: @@ -41,13 +47,14 @@ env: jobs: set-properties: - runs-on: self-hosted + runs-on: [self-hosted, ubuntu-20.04] outputs: properties: ${{ steps.test-properties.outputs.properties }} steps: - name: Checkout code uses: actions/checkout@v3 with: + ref: ${{ github.event.pull_request.head.sha }} persist-credentials: false submodules: recursive - id: test-properties @@ -65,6 +72,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 with: + ref: ${{ github.event.pull_request.head.sha }} persist-credentials: false submodules: recursive - name: Set python version and tox env From 6bd05223b00ed4a2b867a62ee96bfeecd8fc3791 Mon Sep 17 00:00:00 2001 From: Marco Robles Date: Wed, 28 Sep 2022 08:37:27 -0500 Subject: [PATCH 3/4] resolve CI conflicts and fix --- CI.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI.md b/CI.md index ee911584f7f0..207110d17b82 100644 --- a/CI.md +++ b/CI.md @@ -135,7 +135,7 @@ Service Account shall have following permissions ([IAM roles](https://cloud.goog ### PreCommit Workflows | Workflow | Description | Requires GCP Credentials | |----------------------------------------------------------------------------------|-------------------------|---------------------------| -| [job-precommit-placeholder.yml](.github/workflows/job-precommit-placeholder.yml) | Description placeholder | Yes/No | +| [job-precommit-python-runners-portability-spark.yml](.github/workflows/job-precommit-python-runners-portability-spark.yml) | Run Python Precommit Runners Portability Spark | Yes/No | ### PostCommit Workflows | Workflow | Description | Requires GCP Credentials | From f0aac42e3ccc73ab906d94344cc00686862ea156 Mon Sep 17 00:00:00 2001 From: Marco Robles Date: Sat, 1 Oct 2022 10:15:27 -0500 Subject: [PATCH 4/4] update yml job file --- .../job-precommit-python-runners-portability-spark.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/job-precommit-python-runners-portability-spark.yml b/.github/workflows/job-precommit-python-runners-portability-spark.yml index 6383c57acebe..0907acaea5cc 100644 --- a/.github/workflows/job-precommit-python-runners-portability-spark.yml +++ b/.github/workflows/job-precommit-python-runners-portability-spark.yml @@ -56,7 +56,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} persist-credentials: false - submodules: recursive - id: test-properties uses: ./.github/actions/setup-default-test-properties @@ -74,7 +73,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} persist-credentials: false - submodules: recursive - name: Set python version and tox env run: | echo "PYTHON_VERSION=$(echo ${{ matrix.version }} | sed -e 's/\.//g')" >> $GITHUB_ENV