diff --git a/.github/workflows/kbcli-pre-test-k8s.yml b/.github/workflows/kbcli-pre-test-k8s.yml index 60fc4fd7..9f3adb2a 100644 --- a/.github/workflows/kbcli-pre-test-k8s.yml +++ b/.github/workflows/kbcli-pre-test-k8s.yml @@ -27,7 +27,8 @@ on: description: 'test type (apecloud-mysql|postgresql|redis|mongodb|kafka|pulsar|weaviate|qdrant| smartengine|mysqlscale|greptimedb|nebula|risingwave|starrocks|etcd|foxlake|omysql|asmysql| openldap|milvus|clickhouse|pika|opensearch|elasticsearch|tdengine|vllm|orioledb|official-pg|ggml| - zookeeper|mariadb|tidb|xinference|oracle|opengauss|influxdb|flink)' + zookeeper|mariadb|tidb|xinference|oracle|opengauss|influxdb|flink|solr|doris|halo|mogdb| + oceanbase-ent|starrocks-ent|yashandb)' type: string required: false default: '0' @@ -701,6 +702,118 @@ jobs: random-suffix: ${{ needs.install-kubeblocks-pre.outputs.random-suffix }} secrets: inherit + solr-pre: + if: ${{ inputs.previous-version && (inputs.test-type == '' || contains(inputs.test-type, 'solr')) && ! contains(inputs.release-version, 'v0.5.') && ! contains(inputs.release-version, 'v0.6.') && ! contains(inputs.release-version, 'v0.7.') && ! contains(inputs.release-version, 'v0.8.') }} + needs: [ install-kubeblocks-pre ] + uses: ./.github/workflows/test-kbcli-pre.yml + with: + cloud-provider: ${{ inputs.cloud-provider }} + region: ${{ inputs.region }} + release-version: "${{ inputs.previous-version }}" + test-type: "40" + test-type-name: "solr-pre" + test-args: "${{ inputs.test-args }}" + k8s-cluster-name: ${{ inputs.k8s-cluster-name }} + branch-name: ${{ inputs.branch-name }} + random-suffix: ${{ needs.install-kubeblocks-pre.outputs.random-suffix }} + secrets: inherit + + doris-pre: + if: ${{ inputs.previous-version && (inputs.test-type == '' || contains(inputs.test-type, 'doris')) && ! contains(inputs.release-version, 'v0.5.') && ! contains(inputs.release-version, 'v0.6.') && ! contains(inputs.release-version, 'v0.7.') && ! contains(inputs.release-version, 'v0.8.') }} + needs: [ install-kubeblocks-pre ] + uses: ./.github/workflows/test-kbcli-pre.yml + with: + cloud-provider: ${{ inputs.cloud-provider }} + region: ${{ inputs.region }} + release-version: "${{ inputs.previous-version }}" + test-type: "41" + test-type-name: "doris-pre" + test-args: "${{ inputs.test-args }}" + k8s-cluster-name: ${{ inputs.k8s-cluster-name }} + branch-name: ${{ inputs.branch-name }} + random-suffix: ${{ needs.install-kubeblocks-pre.outputs.random-suffix }} + secrets: inherit + + halo-pre: + if: ${{ inputs.previous-version && (inputs.test-type == '' || contains(inputs.test-type, 'halo')) && ! contains(inputs.release-version, 'v0.5.') && ! contains(inputs.release-version, 'v0.6.') && ! contains(inputs.release-version, 'v0.7.') && ! contains(inputs.release-version, 'v0.8.') }} + needs: [ install-kubeblocks-pre ] + uses: ./.github/workflows/test-kbcli-pre.yml + with: + cloud-provider: ${{ inputs.cloud-provider }} + region: ${{ inputs.region }} + release-version: "${{ inputs.previous-version }}" + test-type: "42" + test-type-name: "halo-pre" + test-args: "${{ inputs.test-args }}" + k8s-cluster-name: ${{ inputs.k8s-cluster-name }} + branch-name: ${{ inputs.branch-name }} + random-suffix: ${{ needs.install-kubeblocks-pre.outputs.random-suffix }} + secrets: inherit + + mogdb-pre: + if: ${{ inputs.previous-version && (inputs.test-type == '' || contains(inputs.test-type, 'mogdb')) && ! contains(inputs.release-version, 'v0.5.') && ! contains(inputs.release-version, 'v0.6.') && ! contains(inputs.release-version, 'v0.7.') && ! contains(inputs.release-version, 'v0.8.') }} + needs: [ install-kubeblocks-pre ] + uses: ./.github/workflows/test-kbcli-pre.yml + with: + cloud-provider: ${{ inputs.cloud-provider }} + region: ${{ inputs.region }} + release-version: "${{ inputs.previous-version }}" + test-type: "43" + test-type-name: "mogdb-pre" + test-args: "${{ inputs.test-args }}" + k8s-cluster-name: ${{ inputs.k8s-cluster-name }} + branch-name: ${{ inputs.branch-name }} + random-suffix: ${{ needs.install-kubeblocks-pre.outputs.random-suffix }} + secrets: inherit + + oceanbase-ent-pre: + if: ${{ inputs.previous-version && (inputs.test-type == '' || contains(inputs.test-type, 'oceanbase-ent')) && ! contains(inputs.release-version, 'v0.5.') && ! contains(inputs.release-version, 'v0.6.') && ! contains(inputs.release-version, 'v0.7.') && ! contains(inputs.release-version, 'v0.8.') }} + needs: [ install-kubeblocks-pre ] + uses: ./.github/workflows/test-kbcli-pre.yml + with: + cloud-provider: ${{ inputs.cloud-provider }} + region: ${{ inputs.region }} + release-version: "${{ inputs.previous-version }}" + test-type: "44" + test-type-name: "oceanbase-ent-pre" + test-args: "${{ inputs.test-args }}" + k8s-cluster-name: ${{ inputs.k8s-cluster-name }} + branch-name: ${{ inputs.branch-name }} + random-suffix: ${{ needs.install-kubeblocks-pre.outputs.random-suffix }} + secrets: inherit + + starrocks-ent-pre: + if: ${{ inputs.previous-version && (inputs.test-type == '' || contains(inputs.test-type, 'starrocks-ent')) && ! contains(inputs.release-version, 'v0.5.') && ! contains(inputs.release-version, 'v0.6.') && ! contains(inputs.release-version, 'v0.7.') && ! contains(inputs.release-version, 'v0.8.') }} + needs: [ install-kubeblocks-pre ] + uses: ./.github/workflows/test-kbcli-pre.yml + with: + cloud-provider: ${{ inputs.cloud-provider }} + region: ${{ inputs.region }} + release-version: "${{ inputs.previous-version }}" + test-type: "45" + test-type-name: "starrocks-ent-pre" + test-args: "${{ inputs.test-args }}" + k8s-cluster-name: ${{ inputs.k8s-cluster-name }} + branch-name: ${{ inputs.branch-name }} + random-suffix: ${{ needs.install-kubeblocks-pre.outputs.random-suffix }} + secrets: inherit + + yashandb-pre: + if: ${{ inputs.previous-version && (inputs.test-type == '' || contains(inputs.test-type, 'yashandb')) && ! contains(inputs.release-version, 'v0.5.') && ! contains(inputs.release-version, 'v0.6.') && ! contains(inputs.release-version, 'v0.7.') && ! contains(inputs.release-version, 'v0.8.') }} + needs: [ install-kubeblocks-pre ] + uses: ./.github/workflows/test-kbcli-pre.yml + with: + cloud-provider: ${{ inputs.cloud-provider }} + region: ${{ inputs.region }} + release-version: "${{ inputs.previous-version }}" + test-type: "47" + test-type-name: "yashandb-pre" + test-args: "${{ inputs.test-args }}" + k8s-cluster-name: ${{ inputs.k8s-cluster-name }} + branch-name: ${{ inputs.branch-name }} + random-suffix: ${{ needs.install-kubeblocks-pre.outputs.random-suffix }} + secrets: inherit + send-message: if: ${{ inputs.previous-version && always() }} runs-on: ubuntu-latest @@ -712,7 +825,8 @@ jobs: tdengine-pre, milvus-pre, clickhouse-pre, pika-pre, opensearch-pre, elasticsearch-pre, vllm-pre, orioledb-pre, official-pg-pre, ggml-pre, zookeeper-pre, mariadb-pre , tidb-pre, xinference-pre, oracle-pre, - opengauss-pre, influxdb-pre, flink-pre ] + opengauss-pre, influxdb-pre, flink-pre, solr-pre, doris-pre, halo-pre, + mogdb-pre, oceanbase-ent-pre, starrocks-ent-pre, yashandb-pre] steps: - uses: actions/checkout@v4 with: @@ -884,6 +998,35 @@ jobs: fi fi + if [[ "${{ inputs.release-version }}" != "v0.5."* && "${{ inputs.release-version }}" != "v0.6."* && "${{ inputs.release-version }}" != "v0.7."* && "${{ inputs.release-version }}" != "v0.8."* ]]; then + if [[ "${{ inputs.test-type }}" == '' || "${{ inputs.test-type }}" == *"solr"* ]]; then + TEST_RESULT="${TEST_RESULT}##solr-pre|${{ needs.solr-pre.outputs.test-result }}" + fi + if [[ "${{ inputs.test-type }}" == '' || "${{ inputs.test-type }}" == *"doris"* ]]; then + TEST_RESULT="${TEST_RESULT}##doris-pre|${{ needs.doris-pre.outputs.test-result }}" + fi + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"halo"* ]]; then + TEST_RESULT="${TEST_RESULT}##halo-pre|${{ needs.halo-pre.outputs.test-result }}" + fi + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"mogdb"* ]]; then + TEST_RESULT="${TEST_RESULT}##mogdb-pre|${{ needs.mogdb-pre.outputs.test-result }}" + fi + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"oceanbase-ent"* ]]; then + TEST_RESULT="${TEST_RESULT}##oceanbase-ent-pre|${{ needs.oceanbase-ent-pre.outputs.test-result }}" + fi + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"starrocks-ent"* ]]; then + TEST_RESULT="${TEST_RESULT}##starrocks-ent-pre|${{ needs.starrocks-ent-pre.outputs.test-result }}" + fi + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"yashandb"* ]]; then + TEST_RESULT="${TEST_RESULT}##yashandb-pre|${{ needs.yashandb-pre.outputs.test-result }}" + fi + fi + TEST_RESULT=$( bash .github/utils/utils.sh --type 12 \ --github-repo "${{ github.repository }}" \ --test-result "${TEST_RESULT}" \ diff --git a/.github/workflows/kbcli-test-k8s.yml b/.github/workflows/kbcli-test-k8s.yml index ecdfa69d..f3400d77 100644 --- a/.github/workflows/kbcli-test-k8s.yml +++ b/.github/workflows/kbcli-test-k8s.yml @@ -22,7 +22,8 @@ on: description: 'test type (e.g. apecloud-mysql|postgresql|redis|mongodb|kafka|pulsar|weaviate| qdrant|smartengine|mysqlscale|greptimedb|nebula|risingwave|starrocks|etcd|oceanbase|foxlake| omysql|asmysql|openldap|polardbx|milvus|clickhouse|pika|opensearch|elasticsearch|tdengine| - vllm|orioledb|official-pg|ggml|zookeeper|mariadb|tidb|xinference|oracle|opengauss|influxdb|flink|yashandb)' + vllm|orioledb|official-pg|ggml|zookeeper|mariadb|tidb|xinference|oracle|opengauss|influxdb| + flink|solr|doris|halo|mogdb|oceanbase-ent|starrocks-ent|yashandb)' type: string required: false default: '' @@ -75,7 +76,8 @@ on: description: 'test type (e.g. apecloud-mysql|postgresql|redis|mongodb|kafka|pulsar|weaviate| qdrant|smartengine|mysqlscale|greptimedb|nebula|risingwave|starrocks|etcd|oceanbase|foxlake| omysql|asmysql|openldap|polardbx|milvus|clickhouse|pika|opensearch|elasticsearch|tdengine| - vllm|orioledb|official-pg|ggml|zookeeper|mariadb|tidb|xinference|oracle|opengauss|influxdb|flink|yashandb)' + vllm|orioledb|official-pg|ggml|zookeeper|mariadb|tidb|xinference|oracle|opengauss|influxdb| + flink|solr|doris|halo|mogdb|oceanbase-ent|starrocks-ent|yashandb)' type: string required: false default: '' @@ -817,6 +819,108 @@ jobs: random-suffix: ${{ needs.test-kubeblocks.outputs.random-suffix }} secrets: inherit + test-solr: + if: ${{ needs.terraform-init-k8s.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'solr')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') && ! contains(inputs.KB_VERSION, 'v0.7.') && ! contains(inputs.KB_VERSION, 'v0.8.') }} + needs: [ terraform-init-k8s, test-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: "40" + test-type-name: "solr" + test-args: "${{ inputs.ARGS }}" + k8s-cluster-name: ${{ needs.terraform-init-k8s.outputs.k8s-cluster-name }} + branch-name: ${{ inputs.BRANCH_NAME }} + random-suffix: ${{ needs.test-kubeblocks.outputs.random-suffix }} + secrets: inherit + + test-doris: + if: ${{ needs.terraform-init-k8s.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'doris')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') && ! contains(inputs.KB_VERSION, 'v0.7.') && ! contains(inputs.KB_VERSION, 'v0.8.') }} + needs: [ terraform-init-k8s, test-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: "41" + test-type-name: "doris" + test-args: "${{ inputs.ARGS }}" + k8s-cluster-name: ${{ needs.terraform-init-k8s.outputs.k8s-cluster-name }} + branch-name: ${{ inputs.BRANCH_NAME }} + random-suffix: ${{ needs.test-kubeblocks.outputs.random-suffix }} + secrets: inherit + + test-halo: + if: ${{ needs.terraform-init-k8s.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'halo')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') && ! contains(inputs.KB_VERSION, 'v0.7.') && ! contains(inputs.KB_VERSION, 'v0.8.') }} + needs: [ terraform-init-k8s, test-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: "42" + test-type-name: "halo" + test-args: "${{ inputs.ARGS }}" + k8s-cluster-name: ${{ needs.terraform-init-k8s.outputs.k8s-cluster-name }} + branch-name: ${{ inputs.BRANCH_NAME }} + random-suffix: ${{ needs.test-kubeblocks.outputs.random-suffix }} + secrets: inherit + + test-mogdb: + if: ${{ needs.terraform-init-k8s.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'mogdb')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') && ! contains(inputs.KB_VERSION, 'v0.7.') && ! contains(inputs.KB_VERSION, 'v0.8.') }} + needs: [ terraform-init-k8s, test-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: "43" + test-type-name: "mogdb" + test-args: "${{ inputs.ARGS }}" + k8s-cluster-name: ${{ needs.terraform-init-k8s.outputs.k8s-cluster-name }} + branch-name: ${{ inputs.BRANCH_NAME }} + random-suffix: ${{ needs.test-kubeblocks.outputs.random-suffix }} + secrets: inherit + + test-oceanbase-ent: + if: ${{ needs.terraform-init-k8s.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'oceanbase-ent')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') && ! contains(inputs.KB_VERSION, 'v0.7.') && ! contains(inputs.KB_VERSION, 'v0.8.') }} + needs: [ terraform-init-k8s, test-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: "44" + test-type-name: "oceanbase-ent" + test-args: "${{ inputs.ARGS }}" + k8s-cluster-name: ${{ needs.terraform-init-k8s.outputs.k8s-cluster-name }} + branch-name: ${{ inputs.BRANCH_NAME }} + random-suffix: ${{ needs.test-kubeblocks.outputs.random-suffix }} + secrets: inherit + + test-starrocks-ent: + if: ${{ needs.terraform-init-k8s.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'starrocks-ent')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') && ! contains(inputs.KB_VERSION, 'v0.7.') && ! contains(inputs.KB_VERSION, 'v0.8.') }} + needs: [ terraform-init-k8s, test-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: "45" + test-type-name: "starrocks-ent" + test-args: "${{ inputs.ARGS }}" + k8s-cluster-name: ${{ needs.terraform-init-k8s.outputs.k8s-cluster-name }} + branch-name: ${{ inputs.BRANCH_NAME }} + random-suffix: ${{ needs.test-kubeblocks.outputs.random-suffix }} + secrets: inherit + test-yashandb: if: ${{ needs.terraform-init-k8s.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'yashandb')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') && ! contains(inputs.KB_VERSION, 'v0.7.') && ! contains(inputs.KB_VERSION, 'v0.8.') }} needs: [ terraform-init-k8s, test-kubeblocks ] @@ -844,7 +948,9 @@ jobs: test-openldap, test-polardbx, test-tdengine, test-milvus, test-clickhouse, test-pika, test-opensearch, test-elasticsearch, test-vllm, test-orioledb, test-official-pg, test-ggml, test-zookeeper, test-mariadb , test-tidb, - test-xinference, test-oracle , test-opengauss, test-influxdb, test-flink, test-yashandb ] + test-xinference, test-oracle , test-opengauss, test-influxdb, test-flink, + test-solr, test-doris , test-halo, test-mogdb, test-oceanbase-ent, test-starrocks-ent, + test-yashandb ] steps: - uses: actions/checkout@v4 with: @@ -1019,6 +1125,31 @@ jobs: fi if [[ "${{ inputs.KB_VERSION }}" != "v0.5."* && "${{ inputs.KB_VERSION }}" != "v0.6."* && "${{ inputs.KB_VERSION }}" != "v0.7."* && "${{ inputs.KB_VERSION }}" != "v0.8."* ]]; then + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"solr"* ]]; then + TEST_RESULT="${TEST_RESULT}##solr|${{ needs.test-solr.outputs.test-result }}" + fi + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"doris"* ]]; then + TEST_RESULT="${TEST_RESULT}##doris|${{ needs.test-doris.outputs.test-result }}" + fi + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"halo"* ]]; then + TEST_RESULT="${TEST_RESULT}##halo|${{ needs.test-halo.outputs.test-result }}" + fi + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"mogdb"* ]]; then + TEST_RESULT="${TEST_RESULT}##mogdb|${{ needs.test-mogdb.outputs.test-result }}" + fi + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"oceanbase-ent"* ]]; then + TEST_RESULT="${TEST_RESULT}##oceanbase-ent|${{ needs.test-oceanbase-ent.outputs.test-result }}" + fi + + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"starrocks-ent"* ]]; then + TEST_RESULT="${TEST_RESULT}##starrocks-ent|${{ needs.test-starrocks-ent.outputs.test-result }}" + fi + if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"yashandb"* ]]; then TEST_RESULT="${TEST_RESULT}##yashandb|${{ needs.test-yashandb.outputs.test-result }}" fi diff --git a/.github/workflows/test-kbcli-pre.yml b/.github/workflows/test-kbcli-pre.yml index 3c5d86b0..a6527a0d 100644 --- a/.github/workflows/test-kbcli-pre.yml +++ b/.github/workflows/test-kbcli-pre.yml @@ -171,9 +171,17 @@ jobs: fi if [[ -n "${{ env.AWS_ACCESS_KEY_ID }}" && -n "${{ env.AWS_SECRET_ACCESS_KEY }}" ]]; then - cmd="${cmd} --args '${{ inputs.test-args }} --aws-access-key-id ${{ env.AWS_ACCESS_KEY_ID }} --aws-secret-access-key ${{ env.AWS_SECRET_ACCESS_KEY }}' " + if [[ "${KB_VERSION}" != "0.5."* && "${KB_VERSION}" != "0.6."* && "${KB_VERSION}" != "0.7."* && "${KB_VERSION}" != "0.8."* && -n "${{ env.JIHULAB_ACCESS_TOKEN }}" ]]; then + cmd="${cmd} --args '${{ inputs.test-args }} --aws-access-key-id ${{ env.AWS_ACCESS_KEY_ID }} --aws-secret-access-key ${{ env.AWS_SECRET_ACCESS_KEY }} --jihulab-token ${{ env.JIHULAB_ACCESS_TOKEN }}' " + else + cmd="${cmd} --args '${{ inputs.test-args }} --aws-access-key-id ${{ env.AWS_ACCESS_KEY_ID }} --aws-secret-access-key ${{ env.AWS_SECRET_ACCESS_KEY }}' " + fi else - cmd="${cmd} --args '${{ inputs.test-args }}' " + if [[ "${KB_VERSION}" != "0.5."* && "${KB_VERSION}" != "0.6."* && "${KB_VERSION}" != "0.7."* && "${KB_VERSION}" != "0.8."* && -n "${{ env.JIHULAB_ACCESS_TOKEN }}" ]]; then + cmd="${cmd} --args '${{ inputs.test-args }} --jihulab-token ${{ env.JIHULAB_ACCESS_TOKEN }}' " + else + cmd="${cmd} --args '${{ inputs.test-args }}' " + fi fi echo "$cmd" eval "$cmd" | tee -a ${file_log} diff --git a/.github/workflows/test-kbcli.yml b/.github/workflows/test-kbcli.yml index 988c9df8..65eedcd2 100644 --- a/.github/workflows/test-kbcli.yml +++ b/.github/workflows/test-kbcli.yml @@ -201,9 +201,17 @@ jobs: fi if [[ -n "${{ env.AWS_ACCESS_KEY_ID }}" && -n "${{ env.AWS_SECRET_ACCESS_KEY }}" ]]; then - cmd="${cmd} --args '${{ inputs.test-args }} --aws-access-key-id ${{ env.AWS_ACCESS_KEY_ID }} --aws-secret-access-key ${{ env.AWS_SECRET_ACCESS_KEY }}' " + if [[ "${KB_VERSION}" != "0.5."* && "${KB_VERSION}" != "0.6."* && "${KB_VERSION}" != "0.7."* && "${KB_VERSION}" != "0.8."* && -n "${{ env.JIHULAB_ACCESS_TOKEN }}" ]]; then + cmd="${cmd} --args '${{ inputs.test-args }} --aws-access-key-id ${{ env.AWS_ACCESS_KEY_ID }} --aws-secret-access-key ${{ env.AWS_SECRET_ACCESS_KEY }} --jihulab-token ${{ env.JIHULAB_ACCESS_TOKEN }}' " + else + cmd="${cmd} --args '${{ inputs.test-args }} --aws-access-key-id ${{ env.AWS_ACCESS_KEY_ID }} --aws-secret-access-key ${{ env.AWS_SECRET_ACCESS_KEY }}' " + fi else - cmd="${cmd} --args '${{ inputs.test-args }}' " + if [[ "${KB_VERSION}" != "0.5."* && "${KB_VERSION}" != "0.6."* && "${KB_VERSION}" != "0.7."* && "${KB_VERSION}" != "0.8."* && -n "${{ env.JIHULAB_ACCESS_TOKEN }}" ]]; then + cmd="${cmd} --args '${{ inputs.test-args }} --jihulab-token ${{ env.JIHULAB_ACCESS_TOKEN }}' " + else + cmd="${cmd} --args '${{ inputs.test-args }}' " + fi fi echo "$cmd" eval "$cmd" | tee -a ${file_log}