From 122148b5f193e728fe4b8ddcefee82951cf36185 Mon Sep 17 00:00:00 2001 From: huangzhangshu Date: Fri, 17 Nov 2023 17:51:39 +0800 Subject: [PATCH] chore: test kubechat --- .github/workflows/kubechat-test-k8s.yml | 18 +++++++++--------- .github/workflows/terraform-init.yml | 17 +---------------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.github/workflows/kubechat-test-k8s.yml b/.github/workflows/kubechat-test-k8s.yml index e0bdb011..1eb8227b 100644 --- a/.github/workflows/kubechat-test-k8s.yml +++ b/.github/workflows/kubechat-test-k8s.yml @@ -290,12 +290,12 @@ jobs: --title "$test_title" \ --result "$TEST_RESULT" - terraform-destroy-k8s: - if: ${{ always() }} - needs: [ terraform-init-k8s, send-message ] - uses: ./.github/workflows/terraform-destroy.yml - with: - cloud-provider: ${{ inputs.CLOUD_PROVIDER }} - artifact-name: cicd-${{ inputs.CLOUD_PROVIDER }}-${{ github.sha }} - region: ${{ inputs.REGION }} - secrets: inherit +# terraform-destroy-k8s: +# if: ${{ always() }} +# needs: [ terraform-init-k8s, send-message ] +# uses: ./.github/workflows/terraform-destroy.yml +# with: +# cloud-provider: ${{ inputs.CLOUD_PROVIDER }} +# artifact-name: cicd-${{ inputs.CLOUD_PROVIDER }}-${{ github.sha }} +# region: ${{ inputs.REGION }} +# secrets: inherit diff --git a/.github/workflows/terraform-init.yml b/.github/workflows/terraform-init.yml index 3513d004..5ee909cb 100644 --- a/.github/workflows/terraform-init.yml +++ b/.github/workflows/terraform-init.yml @@ -225,25 +225,10 @@ jobs: cmd="${cmd} --disk-size ${{ inputs.disk-size }} " fi echo "$cmd" - eval "$cmd" - K8S_CLUSTER_NAME="" - if [[ "${{ inputs.cloud-provider }}" == "eks" ]]; then - K8S_CLUSTER_NAME=$(cat terraform.tfstate | grep "\"EKS\":" | awk 'NR==1{print $2}' | sed 's/,//g;s/\"//g') - elif [[ "${{ inputs.cloud-provider }}" == "gke" ]]; then - K8S_CLUSTER_NAME=$(cat terraform.tfstate | grep "\"cluster\":" | awk 'NR==1{print $2}' | sed 's/,//g;s/\"//g') - fi + K8S_CLUSTER_NAME="cicd-gke-gpu" echo "k8s-cluster-name:${K8S_CLUSTER_NAME}" echo k8s-cluster-name=${K8S_CLUSTER_NAME} >> $GITHUB_OUTPUT - - name: upload artifact - uses: actions/upload-artifact@v3 - if: ${{ always() }} - with: - if-no-files-found: error - name: ${{ inputs.artifact-name }} - path: ${{ steps.get_deploy_path.outputs.deploy-path }} - retention-days: 1 - - name: Setup kubectl if: ${{ inputs.cloud-provider == 'gke' && inputs.test-mode == 'kubechat' }} uses: azure/setup-kubectl@v3