From 7644397a33dcae93010cdc1b09acf21a94519895 Mon Sep 17 00:00:00 2001 From: ptiurin Date: Thu, 10 Jul 2025 10:00:37 +0100 Subject: [PATCH 1/6] ci: Add core tests to nightlies --- .github/workflows/nightly-v1.yml | 13 ++++++++++++- .github/workflows/nightly-v2.yml | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-v1.yml b/.github/workflows/nightly-v1.yml index 75f8a70d2c4..5e6f683b275 100644 --- a/.github/workflows/nightly-v1.yml +++ b/.github/workflows/nightly-v1.yml @@ -16,6 +16,17 @@ jobs: secrets: FOSSA_TOKEN: ${{ secrets.FOSSA_TOKEN }} SONARCLOUD_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} + core: + strategy: + fail-fast: false # finish all jobs even if one fails + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + python-version: ['3.8', '3.9', '3.10'] + uses: ./.github/workflows/integration-tests-core.yml + with: + os_name: ${{ matrix.os }} + python_version: ${{ matrix.python-version }} + sendSlackNotifications: true tests: runs-on: ${{ matrix.os }} strategy: @@ -65,7 +76,7 @@ jobs: ACCOUNT_NAME: "firebolt" API_ENDPOINT: "api.staging.firebolt.io" run: | - pytest --timeout_method "thread" -o log_cli=true -o log_cli_level=WARNING --junit-xml=report/junit.xml tests/integration -k "not V2" + pytest --timeout_method "thread" -o log_cli=true -o log_cli_level=WARNING --junit-xml=report/junit.xml tests/integration -k "not V2 and not core" - name: Slack Notify of failure if: failure() diff --git a/.github/workflows/nightly-v2.yml b/.github/workflows/nightly-v2.yml index fda65ee86fc..77b8e2b84b9 100644 --- a/.github/workflows/nightly-v2.yml +++ b/.github/workflows/nightly-v2.yml @@ -16,6 +16,17 @@ jobs: secrets: FOSSA_TOKEN: ${{ secrets.FOSSA_TOKEN }} SONARCLOUD_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} + core: + strategy: + fail-fast: false # finish all jobs even if one fails + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + python-version: ['3.8', '3.9', '3.10'] + uses: ./.github/workflows/integration-tests-core.yml + with: + os_name: ${{ matrix.os }} + python_version: ${{ matrix.python-version }} + sendSlackNotifications: true tests: runs-on: ${{ matrix.os }} strategy: @@ -62,7 +73,7 @@ jobs: ACCOUNT_NAME: ${{ vars.FIREBOLT_ACCOUNT }} API_ENDPOINT: "api.staging.firebolt.io" run: | - pytest --timeout_method "thread" -o log_cli=true -o log_cli_level=WARNING --junit-xml=report/junit.xml tests/integration -k "not V1" + pytest --timeout_method "thread" -o log_cli=true -o log_cli_level=WARNING --junit-xml=report/junit.xml tests/integration -k "not V1 and not core" - name: Slack Notify of failure if: failure() From 14ca893bbafcaedba1a51da2190e2b0e251b4a9d Mon Sep 17 00:00:00 2001 From: ptiurin Date: Thu, 10 Jul 2025 10:10:56 +0100 Subject: [PATCH 2/6] remove windows --- .github/workflows/nightly-v1.yml | 5 +++-- .github/workflows/nightly-v2.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly-v1.yml b/.github/workflows/nightly-v1.yml index 5e6f683b275..3c0e3cf12cf 100644 --- a/.github/workflows/nightly-v1.yml +++ b/.github/workflows/nightly-v1.yml @@ -20,8 +20,9 @@ jobs: strategy: fail-fast: false # finish all jobs even if one fails matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.8', '3.9', '3.10'] + # No windows support for core yet + os: [ubuntu-latest, macos-latest] + python-version: ['3.10', '3.11', '3.12', '3.13'] uses: ./.github/workflows/integration-tests-core.yml with: os_name: ${{ matrix.os }} diff --git a/.github/workflows/nightly-v2.yml b/.github/workflows/nightly-v2.yml index 77b8e2b84b9..7f29dd90432 100644 --- a/.github/workflows/nightly-v2.yml +++ b/.github/workflows/nightly-v2.yml @@ -20,8 +20,9 @@ jobs: strategy: fail-fast: false # finish all jobs even if one fails matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.8', '3.9', '3.10'] + # No windows support for core yet + os: [ubuntu-latest, macos-latest] + python-version: ['3.10', '3.11', '3.12', '3.13'] uses: ./.github/workflows/integration-tests-core.yml with: os_name: ${{ matrix.os }} From 71bde0fdff40a71ac6a320aed1dc734f1a70053a Mon Sep 17 00:00:00 2001 From: ptiurin Date: Thu, 10 Jul 2025 10:15:43 +0100 Subject: [PATCH 3/6] add step for macos --- .github/workflows/integration-tests-core.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/integration-tests-core.yml b/.github/workflows/integration-tests-core.yml index cf9deca010f..e91e5da5906 100644 --- a/.github/workflows/integration-tests-core.yml +++ b/.github/workflows/integration-tests-core.yml @@ -68,6 +68,12 @@ jobs: python -m pip install --upgrade pip pip install ".[dev]" + - name: Setup docker (missing on MacOS) + if: runner.os == 'macos' + run: | + brew install docker + colima start + - name: Log in to GitHub Container Registry uses: docker/login-action@v3 with: From 9fb6aec8567b852cb58f6caacb2beea5c1f73536 Mon Sep 17 00:00:00 2001 From: ptiurin Date: Thu, 10 Jul 2025 10:18:12 +0100 Subject: [PATCH 4/6] remove colima --- .github/workflows/integration-tests-core.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/integration-tests-core.yml b/.github/workflows/integration-tests-core.yml index e91e5da5906..671b41e6742 100644 --- a/.github/workflows/integration-tests-core.yml +++ b/.github/workflows/integration-tests-core.yml @@ -72,7 +72,6 @@ jobs: if: runner.os == 'macos' run: | brew install docker - colima start - name: Log in to GitHub Container Registry uses: docker/login-action@v3 From 058519064fb94f4633bf9f06429632bf00d76552 Mon Sep 17 00:00:00 2001 From: ptiurin Date: Thu, 10 Jul 2025 10:23:56 +0100 Subject: [PATCH 5/6] try with colima again --- .github/workflows/integration-tests-core.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/integration-tests-core.yml b/.github/workflows/integration-tests-core.yml index 671b41e6742..ae66e1acbf3 100644 --- a/.github/workflows/integration-tests-core.yml +++ b/.github/workflows/integration-tests-core.yml @@ -72,6 +72,8 @@ jobs: if: runner.os == 'macos' run: | brew install docker + brew install colima + colima start - name: Log in to GitHub Container Registry uses: docker/login-action@v3 From 20213b3ee39614f2b83c89e9a4d739c1379cec42 Mon Sep 17 00:00:00 2001 From: ptiurin Date: Thu, 10 Jul 2025 10:27:26 +0100 Subject: [PATCH 6/6] remove macos too --- .github/workflows/integration-tests-core.yml | 7 ------- .github/workflows/nightly-v1.yml | 3 ++- .github/workflows/nightly-v2.yml | 3 ++- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration-tests-core.yml b/.github/workflows/integration-tests-core.yml index ae66e1acbf3..cf9deca010f 100644 --- a/.github/workflows/integration-tests-core.yml +++ b/.github/workflows/integration-tests-core.yml @@ -68,13 +68,6 @@ jobs: python -m pip install --upgrade pip pip install ".[dev]" - - name: Setup docker (missing on MacOS) - if: runner.os == 'macos' - run: | - brew install docker - brew install colima - colima start - - name: Log in to GitHub Container Registry uses: docker/login-action@v3 with: diff --git a/.github/workflows/nightly-v1.yml b/.github/workflows/nightly-v1.yml index 3c0e3cf12cf..cee27ed51e5 100644 --- a/.github/workflows/nightly-v1.yml +++ b/.github/workflows/nightly-v1.yml @@ -21,7 +21,8 @@ jobs: fail-fast: false # finish all jobs even if one fails matrix: # No windows support for core yet - os: [ubuntu-latest, macos-latest] + # Macos is missing docker support + os: [ubuntu-latest] python-version: ['3.10', '3.11', '3.12', '3.13'] uses: ./.github/workflows/integration-tests-core.yml with: diff --git a/.github/workflows/nightly-v2.yml b/.github/workflows/nightly-v2.yml index 7f29dd90432..9448e863b0a 100644 --- a/.github/workflows/nightly-v2.yml +++ b/.github/workflows/nightly-v2.yml @@ -21,7 +21,8 @@ jobs: fail-fast: false # finish all jobs even if one fails matrix: # No windows support for core yet - os: [ubuntu-latest, macos-latest] + # Macos is missing docker support + os: [ubuntu-latest] python-version: ['3.10', '3.11', '3.12', '3.13'] uses: ./.github/workflows/integration-tests-core.yml with: