From b1e44e05a92fdce6fc59ed842636c8a54738501d Mon Sep 17 00:00:00 2001 From: Vivekanand Ilango Date: Thu, 23 May 2024 14:28:17 +0200 Subject: [PATCH] Separate container integrations --- .github/workflows/master.yml | 14 +++- .github/workflows/test-all.yml | 3 + .github/workflows/test-dbm.yml | 147 --------------------------------- 3 files changed, 16 insertions(+), 148 deletions(-) delete mode 100644 .github/workflows/test-dbm.yml diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index fa6ad2af1cc6c..96b3883a9c185 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -97,7 +97,19 @@ jobs: needs: - cache - uses: ./.github/workflows/test-dbm.yml + uses: ./.github/workflows/test-dbm-integrations.yml + with: + repo: core + + # Options + standard: true + secrets: inherit + + test-container-integrations: + needs: + - cache + + uses: ./.github/workflows/test-container-integrations.yml with: repo: core diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml index fbc628ae04ca5..49d50563f4e32 100644 --- a/.github/workflows/test-all.yml +++ b/.github/workflows/test-all.yml @@ -1417,6 +1417,7 @@ jobs: test-py3: ${{ inputs.test-py3 }} minimum-base-package: ${{ inputs.minimum-base-package }} secrets: inherit +<<<<<<< HEAD j92491f1: uses: ./.github/workflows/test-target.yml with: @@ -1588,6 +1589,8 @@ jobs: test-py3: ${{ inputs.test-py3 }} minimum-base-package: ${{ inputs.minimum-base-package }} secrets: inherit +======= +>>>>>>> d262fb582d (Separate container integrations) j61e565f: uses: ./.github/workflows/test-target.yml with: diff --git a/.github/workflows/test-dbm.yml b/.github/workflows/test-dbm.yml deleted file mode 100644 index 7635a79e6fea6..0000000000000 --- a/.github/workflows/test-dbm.yml +++ /dev/null @@ -1,147 +0,0 @@ -name: Test dbm integrations - -on: - workflow_call: - inputs: - repo: - required: true - type: string - - python-version: - required: false - default: "" - type: string - standard: - required: false - default: false - type: boolean - latest: - required: false - default: false - type: boolean - minimum-base-package: - required: false - default: false - type: boolean - test-py2: - required: false - default: false - type: boolean - test-py3: - required: false - default: true - type: boolean - agent-image: - required: false - default: "" - type: string - agent-image-py2: - required: false - default: "" - type: string - agent-image-windows: - required: false - default: "" - type: string - agent-image-windows-py2: - required: false - default: "" - type: string - -jobs: - j44368ad: - uses: ./.github/workflows/test-target.yml - with: - job-name: Postgres - target: postgres - platform: linux - runner: '["ubuntu-22.04"]' - repo: "${{ inputs.repo }}" - python-version: "${{ inputs.python-version }}" - standard: ${{ inputs.standard }} - latest: ${{ inputs.latest }} - agent-image: "${{ inputs.agent-image }}" - agent-image-py2: "${{ inputs.agent-image-py2 }}" - agent-image-windows: "${{ inputs.agent-image-windows }}" - agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}" - test-py2: ${{ inputs.test-py2 }} - test-py3: ${{ inputs.test-py3 }} - minimum-base-package: ${{ inputs.minimum-base-package }} - secrets: inherit - j211906c: - uses: ./.github/workflows/test-target.yml - with: - job-name: MySQL - target: mysql - platform: linux - runner: '["ubuntu-20.04"]' - repo: "${{ inputs.repo }}" - python-version: "${{ inputs.python-version }}" - standard: ${{ inputs.standard }} - latest: ${{ inputs.latest }} - agent-image: "${{ inputs.agent-image }}" - agent-image-py2: "${{ inputs.agent-image-py2 }}" - agent-image-windows: "${{ inputs.agent-image-windows }}" - agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}" - test-py2: ${{ inputs.test-py2 }} - test-py3: ${{ inputs.test-py3 }} - minimum-base-package: ${{ inputs.minimum-base-package }} - secrets: inherit - j748e188: - uses: ./.github/workflows/test-target.yml - with: - job-name: Oracle Database - target: oracle - platform: linux - runner: '["ubuntu-22.04"]' - repo: "${{ inputs.repo }}" - python-version: "${{ inputs.python-version }}" - standard: ${{ inputs.standard }} - latest: ${{ inputs.latest }} - agent-image: "${{ inputs.agent-image }}" - agent-image-py2: "${{ inputs.agent-image-py2 }}" - agent-image-windows: "${{ inputs.agent-image-windows }}" - agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}" - test-py2: ${{ inputs.test-py2 }} - test-py3: ${{ inputs.test-py3 }} - minimum-base-package: ${{ inputs.minimum-base-package }} - secrets: inherit - j31a95c8: - uses: ./.github/workflows/test-target.yml - with: - job-name: SQL Server on Windows - target: sqlserver - platform: windows - runner: '["windows-2019"]' - repo: "${{ inputs.repo }}" - python-version: "${{ inputs.python-version }}" - standard: ${{ inputs.standard }} - latest: ${{ inputs.latest }} - agent-image: "${{ inputs.agent-image }}" - agent-image-py2: "${{ inputs.agent-image-py2 }}" - agent-image-windows: "${{ inputs.agent-image-windows }}" - agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}" - test-py2: ${{ inputs.test-py2 }} - test-py3: ${{ inputs.test-py3 }} - minimum-base-package: ${{ inputs.minimum-base-package }} - secrets: inherit - j3a8e004: - uses: ./.github/workflows/test-target.yml - with: - job-name: SQL Server on Linux - target: sqlserver - platform: linux - runner: '["ubuntu-22.04"]' - repo: "${{ inputs.repo }}" - python-version: "${{ inputs.python-version }}" - standard: ${{ inputs.standard }} - latest: ${{ inputs.latest }} - agent-image: "${{ inputs.agent-image }}" - agent-image-py2: "${{ inputs.agent-image-py2 }}" - agent-image-windows: "${{ inputs.agent-image-windows }}" - agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}" - test-py2: ${{ inputs.test-py2 }} - test-py3: ${{ inputs.test-py3 }} - minimum-base-package: ${{ inputs.minimum-base-package }} - secrets: inherit - \ No newline at end of file