mirror of https://github.com/citusdata/citus.git
Reorganize failtester matrix
parent
97a8a31cef
commit
0fd2e9bfa2
|
@ -94,17 +94,9 @@ jobs:
|
||||||
- "citus/extbuilder"
|
- "citus/extbuilder"
|
||||||
image_suffix:
|
image_suffix:
|
||||||
- ${{ inputs.image_suffix}}
|
- ${{ inputs.image_suffix}}
|
||||||
pg_major:
|
|
||||||
- 14
|
|
||||||
- 15
|
|
||||||
pg_version:
|
pg_version:
|
||||||
- ${{ inputs.pg14_version }}
|
- ${{ inputs.pg14_version }}
|
||||||
- ${{ inputs.pg15_version }}
|
- ${{ inputs.pg15_version }}
|
||||||
exclude:
|
|
||||||
- pg_major: 14
|
|
||||||
pg_version: ${{ inputs.pg15_version }}
|
|
||||||
- pg_major: 15
|
|
||||||
pg_version: ${{ inputs.pg14_version }}
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ matrix.image_suffix }}"
|
image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ matrix.image_suffix }}"
|
||||||
|
@ -115,10 +107,10 @@ jobs:
|
||||||
run: "./ci/build-citus.sh"
|
run: "./ci/build-citus.sh"
|
||||||
- uses: actions/upload-artifact@v3.1.1
|
- uses: actions/upload-artifact@v3.1.1
|
||||||
with:
|
with:
|
||||||
name: build-${{ matrix.pg_major }}
|
name: build-${{ matrix.pg_version }}
|
||||||
path: |-
|
path: |-
|
||||||
./build-${{ matrix.pg_major }}/*
|
./build-${{ matrix.pg_version }}/*
|
||||||
./install-${{ matrix.pg_major }}.tar
|
./install-${{ matrix.pg_version }}.tar
|
||||||
test-citus-exttester:
|
test-citus-exttester:
|
||||||
name: Test ${{ matrix.make }} PG${{ matrix.pg_version }}
|
name: Test ${{ matrix.make }} PG${{ matrix.pg_version }}
|
||||||
strategy:
|
strategy:
|
||||||
|
@ -128,9 +120,6 @@ jobs:
|
||||||
- "citus/exttester"
|
- "citus/exttester"
|
||||||
image_suffix:
|
image_suffix:
|
||||||
- ${{ inputs.image_suffix}}
|
- ${{ inputs.image_suffix}}
|
||||||
pg_major:
|
|
||||||
- 14
|
|
||||||
- 15
|
|
||||||
pg_version:
|
pg_version:
|
||||||
- ${{ inputs.pg14_version }}
|
- ${{ inputs.pg14_version }}
|
||||||
- ${{ inputs.pg15_version }}
|
- ${{ inputs.pg15_version }}
|
||||||
|
@ -150,33 +139,25 @@ jobs:
|
||||||
- check-enterprise-isolation-logicalrep-1
|
- check-enterprise-isolation-logicalrep-1
|
||||||
- check-enterprise-isolation-logicalrep-2
|
- check-enterprise-isolation-logicalrep-2
|
||||||
- check-enterprise-isolation-logicalrep-3
|
- check-enterprise-isolation-logicalrep-3
|
||||||
exclude:
|
|
||||||
- pg_major: 14
|
|
||||||
pg_version: ${{ inputs.pg15_version }}
|
|
||||||
- pg_major: 15
|
|
||||||
pg_version: ${{ inputs.pg14_version }}
|
|
||||||
include:
|
include:
|
||||||
- make: check-failure
|
- make: check-failure
|
||||||
image_name: "citus/failtester"
|
image_name: "citus/failtester"
|
||||||
pg_major: [14, 15]
|
|
||||||
pg_version:
|
pg_version:
|
||||||
- ${{ inputs.pg15_version }}
|
- ${{ inputs.pg15_version }}
|
||||||
- ${{ inputs.pg14_version }}
|
- ${{ inputs.pg14_version }}
|
||||||
- make: check-enterprise-failure
|
- make: check-enterprise-failure
|
||||||
image_name: "citus/failtester"
|
image_name: "citus/failtester"
|
||||||
pg_major: [14, 15]
|
|
||||||
pg_version:
|
pg_version:
|
||||||
- ${{ inputs.pg15_version }}
|
- ${{ inputs.pg15_version }}
|
||||||
- ${{ inputs.pg14_version }}
|
- ${{ inputs.pg14_version }}
|
||||||
- make: check-pytest
|
- make: check-pytest
|
||||||
image_name: "citus/failtester"
|
image_name: "citus/failtester"
|
||||||
pg_major: [14, 15]
|
|
||||||
pg_version:
|
pg_version:
|
||||||
- ${{ inputs.pg15_version }}
|
- ${{ inputs.pg15_version }}
|
||||||
- ${{ inputs.pg14_version }}
|
- ${{ inputs.pg14_version }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ inputs.image_suffix }}"
|
image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ matrix.image_suffix }}"
|
||||||
options: --user root
|
options: --user root
|
||||||
needs:
|
needs:
|
||||||
- build
|
- build
|
||||||
|
@ -184,10 +165,10 @@ jobs:
|
||||||
- uses: actions/checkout@v3.5.0
|
- uses: actions/checkout@v3.5.0
|
||||||
- uses: actions/download-artifact@v3.0.1
|
- uses: actions/download-artifact@v3.0.1
|
||||||
with:
|
with:
|
||||||
name: build-${{ matrix.pg_major }}
|
name: build-${{ matrix.pg_version }}
|
||||||
- uses: "./.github/actions/install_extension"
|
- uses: "./.github/actions/install_extension"
|
||||||
with:
|
with:
|
||||||
pg_major: "${{ matrix.pg_major }}"
|
pg_major: "${{ matrix.pg_version }}"
|
||||||
- uses: "./.github/actions/configure"
|
- uses: "./.github/actions/configure"
|
||||||
- uses: "./.github/actions/enable_core"
|
- uses: "./.github/actions/enable_core"
|
||||||
- name: Run Test
|
- name: Run Test
|
||||||
|
|
Loading…
Reference in New Issue