From 30ce56d45cf7f2298b49bf2f9001ef2a22371f9b Mon Sep 17 00:00:00 2001 From: huangzhangshu Date: Tue, 10 Oct 2023 14:20:17 +0800 Subject: [PATCH] chore: test clickhouse --- .github/workflows/kbcli-test-k8s.yml | 63 ++++++++++++++++++---------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/.github/workflows/kbcli-test-k8s.yml b/.github/workflows/kbcli-test-k8s.yml index f897331..850d757 100644 --- a/.github/workflows/kbcli-test-k8s.yml +++ b/.github/workflows/kbcli-test-k8s.yml @@ -19,7 +19,7 @@ on: required: false default: '' TEST_TYPE: - description: 'test type (e.g. apecloud-mysql|postgres|redis|mongo|kafka|pulsar|weaviate|qdrant|smarte|scale|greptimedb|nebula|risingwave|starrocks|oceanbase|foxlake|oracle-mysql|asmysql|openldap|polardbx)' + description: 'test type (e.g. apecloud-mysql|postgres|redis|mongo|kafka|pulsar|weaviate|qdrant|smarte|scale|greptimedb|nebula|risingwave|starrocks|oceanbase|foxlake|oracle-mysql|asmysql|openldap|polardbx|clickhouse)' type: string required: false default: '' @@ -403,22 +403,22 @@ jobs: random-suffix: ${{ needs.install-kubeblocks.outputs.random-suffix }} secrets: inherit - test-foxlake: - if: ${{ needs.terraform-init-k8s.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'foxlake')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') }} - needs: [ terraform-init-k8s, install-kubeblocks ] - uses: ./.github/workflows/test-kbcli.yml - with: - cloud-provider: ${{ inputs.CLOUD_PROVIDER }} - region: ${{ inputs.REGION }} - release-version: "${{ inputs.KB_VERSION }}" - previous-version: "${{ inputs.KB_PRE_VERSION }}" - test-type: "17" - test-type-name: "foxlake" - test-args: "${{ inputs.ARGS }}" - k8s-cluster-name: ${{ needs.terraform-init-k8s.outputs.k8s-cluster-name }} - branch-name: ${{ inputs.BRANCH_NAME }} - random-suffix: ${{ needs.install-kubeblocks.outputs.random-suffix }} - secrets: inherit +# test-foxlake: +# if: ${{ needs.terraform-init-k8s.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'foxlake')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') }} +# needs: [ terraform-init-k8s, install-kubeblocks ] +# uses: ./.github/workflows/test-kbcli.yml +# with: +# cloud-provider: ${{ inputs.CLOUD_PROVIDER }} +# region: ${{ inputs.REGION }} +# release-version: "${{ inputs.KB_VERSION }}" +# previous-version: "${{ inputs.KB_PRE_VERSION }}" +# test-type: "17" +# test-type-name: "foxlake" +# test-args: "${{ inputs.ARGS }}" +# k8s-cluster-name: ${{ needs.terraform-init-k8s.outputs.k8s-cluster-name }} +# branch-name: ${{ inputs.BRANCH_NAME }} +# random-suffix: ${{ needs.install-kubeblocks.outputs.random-suffix }} +# secrets: inherit test-oracle-mysql: if: ${{ needs.terraform-init-k8s.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'oracle-mysql')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') }} @@ -488,10 +488,27 @@ jobs: random-suffix: ${{ needs.install-kubeblocks.outputs.random-suffix }} secrets: inherit + test-clickhouse: + if: ${{ needs.terraform-init-k8s.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'clickhouse')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') }} + needs: [ terraform-init-k8s, install-kubeblocks ] + uses: ./.github/workflows/test-kbcli.yml + with: + cloud-provider: ${{ inputs.CLOUD_PROVIDER }} + region: ${{ inputs.REGION }} + release-version: "${{ inputs.KB_VERSION }}" + previous-version: "${{ inputs.KB_PRE_VERSION }}" + test-type: "29" + test-type-name: "clickhouse" + test-args: "${{ inputs.ARGS }}" + k8s-cluster-name: ${{ needs.terraform-init-k8s.outputs.k8s-cluster-name }} + branch-name: ${{ inputs.BRANCH_NAME }} + random-suffix: ${{ needs.install-kubeblocks.outputs.random-suffix }} + secrets: inherit + send-message: if: ${{ always() }} runs-on: ubuntu-latest - needs: [ test-playground, install-kubeblocks, test-apecloud-mysql, test-postgresql, test-redis, test-mongodb, test-kafka, test-pulsar, test-mysqlscale, test-weaviate, test-qdrant, test-smartengine, test-greptimedb, test-nebula, test-risingwave, test-starrocks, test-oceanbase, test-foxlake, test-oracle-mysql, test-asmysql, test-openldap, test-polardbx ] + needs: [ test-playground, install-kubeblocks, test-apecloud-mysql, test-postgresql, test-redis, test-mongodb, test-kafka, test-pulsar, test-mysqlscale, test-weaviate, test-qdrant, test-smartengine, test-greptimedb, test-nebula, test-risingwave, test-starrocks, test-oceanbase, test-oracle-mysql, test-asmysql, test-openldap, test-polardbx, test-clickhouse ] steps: - uses: actions/checkout@v4 with: @@ -566,9 +583,9 @@ jobs: TEST_RESULT="${TEST_RESULT}##oceanbase|${{ needs.test-oceanbase.outputs.test-result }}" fi - if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"foxlake"* ]]; then - TEST_RESULT="${TEST_RESULT}##foxlake|${{ needs.test-foxlake.outputs.test-result }}" - fi +# if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"foxlake"* ]]; then +# TEST_RESULT="${TEST_RESULT}##foxlake|${{ needs.test-foxlake.outputs.test-result }}" +# fi if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"oracle-mysql"* ]]; then TEST_RESULT="${TEST_RESULT}##oracle-mysql|${{ needs.test-oracle-mysql.outputs.test-result }}" @@ -585,6 +602,10 @@ jobs: if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"polardbx"* ]]; then TEST_RESULT="${TEST_RESULT}##polardbx|${{ needs.test-polardbx.outputs.test-result }}" fi + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"clickhouse"* ]]; then + TEST_RESULT="${TEST_RESULT}##clickhouse|${{ needs.test-clickhouse.outputs.test-result }}" + fi fi TEST_RESULT=$( bash .github/utils/utils.sh --type 12 \