Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: change test type describe #303

Merged
merged 1 commit into from
Feb 19, 2024
Merged

chore: change test type describe #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 15 additions & 20 deletions .github/workflows/kbcli-test-k3s.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
name: Kbcli Test on K3S

on:
workflow_call:
workflow_dispatch:
inputs:
KB_VERSION:
description: 'kubeblocks release version'
type: string
required: false
default: 'latest'
KB_PRE_VERSION:
Expand All @@ -14,33 +13,30 @@ on:
required: false
default: ''
TEST_TYPE:
description: 'test type (e.g. 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|solr|doris|halo|mogdb|
starrocks-ent|yashandb)'
description: 'test type (e.g. apecloud-mysql|postgresql|redis|mongodb|kafka|pulsar|mysqlscale|weaviate|qdrant|smartengine|
greptimedb|nebula|risingwave|starrocks|etcd|foxlake|orioledb|oracle-mysql|official-pg|asmysql|openldap|
opensearch|elasticsearch|vllm|tdengine|milvus|clickhouse|pika|ggml|zookeeper|mariadb|tidb|xinference|
oracle|opengauss|influxdb|flink|solr|doris|halo|mogdb|starrocks-ent|apecloud-postgresql|yashandb)'
type: string
required: false
default: ''
CLUSTER_VERSION:
description: 'k3s cluster version (e.g. 1.26)'
type: string
required: false
default: '1.26'
BRANCH_NAME:
description: 'testinfra branch name'
type: string
required: false
default: 'main'
ARGS:
description: "Test args"
type: string
required: false
default: ''
workflow_dispatch:
workflow_call:
inputs:
KB_VERSION:
description: 'kubeblocks release version'
type: string
required: false
default: 'latest'
KB_PRE_VERSION:
Expand All @@ -49,24 +45,23 @@ on:
required: false
default: ''
TEST_TYPE:
description: 'test type (e.g. 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|solr|doris|halo|mogdb|
starrocks-ent|yashandb)'
description: 'test type'
type: string
required: false
default: ''
CLUSTER_VERSION:
description: 'k3s cluster version (e.g. 1.26)'
description: 'k3s cluster version'
type: string
required: false
default: '1.26'
BRANCH_NAME:
description: 'testinfra branch name'
type: string
required: false
default: 'main'
ARGS:
description: "Test args"
type: string
required: false
default: ''

Expand Down Expand Up @@ -327,7 +322,7 @@ jobs:
secrets: inherit

test-oracle-mysql:
if: ${{ needs.enable-gke-runner.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'omysql')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') }}
if: ${{ needs.enable-gke-runner.result == 'success' && always() && (inputs.TEST_TYPE == '' || contains(inputs.TEST_TYPE, 'oracle-mysql')) && ! contains(inputs.KB_VERSION, 'v0.5.') && ! contains(inputs.KB_VERSION, 'v0.6.') }}
needs: [ enable-gke-runner ]
uses: ./.github/workflows/test-kbcli-k3s.yml
with:
Expand Down Expand Up @@ -778,7 +773,7 @@ jobs:
TEST_RESULT="${TEST_RESULT}##foxlake|${{ needs.test-foxlake.outputs.pre-test-result }}"
fi

if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"omysql"* ]]; then
if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"oracle-mysql"* ]]; then
TEST_RESULT="${TEST_RESULT}##oracle-mysql|${{ needs.test-oracle-mysql.outputs.pre-test-result }}"
fi

Expand Down Expand Up @@ -973,7 +968,7 @@ jobs:
TEST_RESULT="${TEST_RESULT}##foxlake|${{ needs.test-foxlake.outputs.test-result }}"
fi

if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"omysql"* ]]; then
if [[ "${{ inputs.TEST_TYPE }}" == '' || "${{ inputs.TEST_TYPE }}" == *"oracle-mysql"* ]]; then
TEST_RESULT="${TEST_RESULT}##oracle-mysql|${{ needs.test-oracle-mysql.outputs.test-result }}"
fi

Expand Down
41 changes: 18 additions & 23 deletions .github/workflows/kbcli-test-k8s.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
name: Kbcli Test on K8S

on:
workflow_call:
workflow_dispatch:
inputs:
CLOUD_PROVIDER:
description: 'cloud k8s cluster provider (e.g. eks/gke)'
type: string
required: false
default: 'eks'
KB_VERSION:
description: 'kubeblocks release version'
type: string
required: false
default: 'latest'
KB_PRE_VERSION:
Expand All @@ -19,52 +17,47 @@ on:
required: false
default: ''
TEST_TYPE:
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|solr|doris|halo|mogdb|oceanbase-ent|starrocks-ent|yashandb)'
description: 'test type (e.g. apecloud-mysql|postgresql|redis|mongodb|kafka|pulsar|mysqlscale|weaviate|qdrant|smartengine|
greptimedb|nebula|risingwave|starrocks|etcd|oceanbase|foxlake|orioledb|oracle-mysql|official-pg|asmysql|openldap|
polardbx|opensearch|elasticsearch|vllm|tdengine|milvus|clickhouse|pika|ggml|zookeeper|mariadb|tidb|xinference|
oracle|opengauss|influxdb|flink|solr|doris|halo|mogdb|oceanbase-ent|starrocks-ent|apecloud-postgresql|yashandb)'
type: string
required: false
default: ''
CLUSTER_VERSION:
description: 'k8s cluster version (e.g. 1.26)'
type: string
required: false
default: '1.26'
REGION:
description: 'k8s region name'
type: string
required: false
default: 'cn-northwest-1'
INSTANCE_TYPE:
description: 'node instance types (e.g. amd64/arm64)'
type: string
required: false
default: 'amd64'
BRANCH_NAME:
description: 'testinfra branch name'
type: string
required: false
default: 'main'
APECD_REF:
description: "The branch name of apecloud-cd"
type: string
required: false
default: 'main'
ARGS:
description: "Test args"
type: string
required: false
default: ''
workflow_dispatch:
workflow_call:
inputs:
CLOUD_PROVIDER:
description: 'cloud k8s cluster provider (e.g. eks/gke)'
description: 'cloud k8s cluster provider'
type: string
required: false
default: 'eks'
KB_VERSION:
description: 'kubeblocks release version'
type: string
required: false
default: 'latest'
KB_PRE_VERSION:
Expand All @@ -73,36 +66,38 @@ on:
required: false
default: ''
TEST_TYPE:
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|solr|doris|halo|mogdb|oceanbase-ent|starrocks-ent|yashandb)'
description: 'test type'
type: string
required: false
default: ''
CLUSTER_VERSION:
description: 'k8s cluster version (e.g. 1.26)'
description: 'k8s cluster version'
type: string
required: false
default: '1.26'
REGION:
description: 'k8s region name'
type: string
required: false
default: 'cn-northwest-1'
INSTANCE_TYPE:
description: 'node instance types (e.g. amd64/arm64)'
description: 'node instance types'
type: string
required: false
default: 'amd64'
BRANCH_NAME:
description: 'testinfra branch name'
type: string
required: false
default: 'main'
APECD_REF:
description: "The branch name of apecloud-cd"
type: string
required: false
default: 'main'
ARGS:
description: "Test args"
type: string
required: false
default: ''

Expand Down