From b4a857685bed103b127efc95a7029933258619c5 Mon Sep 17 00:00:00 2001 From: Peter Nguyen Date: Sat, 3 May 2025 12:27:12 -0700 Subject: [PATCH 1/4] Merge python-integration.yml into python-ci.yml --- .github/workflows/python-ci.yml | 17 +++++++ .github/workflows/python-integration.yml | 61 ------------------------ 2 files changed, 17 insertions(+), 61 deletions(-) delete mode 100644 .github/workflows/python-integration.yml diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 8b4f16dd0f..78f0df6dca 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -66,3 +66,20 @@ jobs: run: make lint - name: Tests run: make test-coverage + + integration-test: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 2 + - name: Install system dependencies + run: sudo apt-get update && sudo apt-get install -y libkrb5-dev # for kerberos + - name: Install + run: make install + - name: Run integration tests + run: make test-integration + - name: Show debug logs + if: ${{ failure() }} + run: docker compose -f dev/docker-compose.yml logs diff --git a/.github/workflows/python-integration.yml b/.github/workflows/python-integration.yml deleted file mode 100644 index 9b4efc4111..0000000000 --- a/.github/workflows/python-integration.yml +++ /dev/null @@ -1,61 +0,0 @@ -# -# 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: "Python Integration" - -on: - push: - branches: - - 'main' - pull_request: - paths: - - '**' # Include all files and directories in the repository by default. - - '!.github/workflows/**' # Exclude all workflow files - - '.github/workflows/python-integration.yml' # except the current file. - - '!.github/ISSUE_TEMPLATE/**' # Exclude files and directories that don't impact tests or code like templates, metadata, and documentation. - - '!.gitignore' - - '!.asf.yml' - - '!mkdocs/**' - - '!.gitattributes' - - '!README.md' - - '!CONTRIBUTING.md' - - '!LICENSE' - - '!NOTICE' - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ github.event_name == 'pull_request' }} - -jobs: - integration-test: - runs-on: ubuntu-22.04 - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 2 - - name: Install system dependencies - run: sudo apt-get update && sudo apt-get install -y libkrb5-dev # for kerberos - - name: Install - run: make install - - name: Run integration tests - run: make test-integration - - name: Show debug logs - if: ${{ failure() }} - run: docker compose -f dev/docker-compose.yml logs From fd119109b727d643b69844b87726f9225a37a3e1 Mon Sep 17 00:00:00 2001 From: Peter Nguyen Date: Mon, 5 May 2025 17:21:19 -0700 Subject: [PATCH 2/4] Separate unit and integration jobs in python-ci.yml --- .github/workflows/python-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 78f0df6dca..1e048efaf0 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -65,7 +65,7 @@ jobs: - name: Linters run: make lint - name: Tests - run: make test-coverage + run: make test-coverage-unit integration-test: runs-on: ubuntu-22.04 @@ -79,7 +79,7 @@ jobs: - name: Install run: make install - name: Run integration tests - run: make test-integration + run: make test-coverage-integration - name: Show debug logs if: ${{ failure() }} run: docker compose -f dev/docker-compose.yml logs From 4033113d06f0def1ff52ff8639f25b7301f8de9b Mon Sep 17 00:00:00 2001 From: Peter Nguyen Date: Mon, 5 May 2025 17:31:45 -0700 Subject: [PATCH 3/4] Add python version matrix to integration test ci --- .github/workflows/python-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 1e048efaf0..28d1148a3c 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -69,6 +69,9 @@ jobs: integration-test: runs-on: ubuntu-22.04 + strategy: + matrix: + python: ['3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 From bbd2a18bf05fc59467e84e970e69190ab69d1d46 Mon Sep 17 00:00:00 2001 From: Peter Nguyen Date: Tue, 6 May 2025 10:02:01 -0700 Subject: [PATCH 4/4] Use default fetch-depth of 1 --- .github/workflows/python-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 28d1148a3c..0e0b0c0f62 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -75,8 +75,6 @@ jobs: steps: - uses: actions/checkout@v4 - with: - fetch-depth: 2 - name: Install system dependencies run: sudo apt-get update && sudo apt-get install -y libkrb5-dev # for kerberos - name: Install