diff --git a/.github/workflows/cicd-pull-request.yml b/.github/workflows/cicd-pull-request.yml index 7260b3229ef..4e3834b8269 100644 --- a/.github/workflows/cicd-pull-request.yml +++ b/.github/workflows/cicd-pull-request.yml @@ -77,12 +77,12 @@ jobs: run: | curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2 - - name: make test ${{ matrix.ops }} + - name: make ${{ matrix.ops }} if: ${{ ! contains(matrix.ops, '/') }} run: | make ${{ matrix.ops }} - - name: make ${{ matrix.ops }} + - name: make test ${{ matrix.ops }} if: ${{ contains(matrix.ops, '/') }} run: | make test TEST_PACKAGES=./${{ matrix.ops }}/... diff --git a/.github/workflows/e2e-kbcli.yml b/.github/workflows/e2e-kbcli.yml index 6a597ba2df8..9c6014b1be1 100644 --- a/.github/workflows/e2e-kbcli.yml +++ b/.github/workflows/e2e-kbcli.yml @@ -88,6 +88,7 @@ jobs: e2e: name: ${{ inputs.CLOUD_PROVIDER }} needs: check + if: ${{ inputs.CLOUD_PROVIDER != 'k3s' }} uses: apecloud/apecloud-cd/.github/workflows/kbcli-test-k8s.yml@main with: CLOUD_PROVIDER: "${{ inputs.CLOUD_PROVIDER }}" @@ -100,3 +101,16 @@ jobs: ARGS: "${{ inputs.ARGS }}" TEST_TYPE: "${{ inputs.TEST_TYPE }}" secrets: inherit + + k3s: + needs: check + if: ${{ inputs.CLOUD_PROVIDER == 'k3s' }} + uses: apecloud/apecloud-cd/.github/workflows/kbcli-test-k3s.yml@main + with: + KB_VERSION: "${{ needs.check.outputs.release-version }}" + KB_PRE_VERSION: "${{ inputs.PRE_VERSION }}" + CLUSTER_VERSION: "${{ inputs.CLUSTER_VERSION }}" + BRANCH_NAME: "${{ inputs.BRANCH_NAME }}" + ARGS: "${{ inputs.ARGS }}" + TEST_TYPE: "${{ inputs.TEST_TYPE }}" + secrets: inherit diff --git a/.github/workflows/release-version.yml b/.github/workflows/release-version.yml index 1e728c23ee2..0aff15b9e26 100644 --- a/.github/workflows/release-version.yml +++ b/.github/workflows/release-version.yml @@ -62,11 +62,12 @@ jobs: run: | curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2 - - name: make test ${{ matrix.ops }} + - name: make ${{ matrix.ops }} + if: ${{ ! contains(matrix.ops, '/') }} run: | make ${{ matrix.ops }} - - name: make ${{ matrix.ops }} + - name: make test ${{ matrix.ops }} if: ${{ contains(matrix.ops, '/') }} run: | make test TEST_PACKAGES=./${{ matrix.ops }}/...