The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Fix PR envs cleaning (#70024)
Anton Kostenkoeb2099125948
diff --git a/.github/workflows/pr-env-close-unlabel.yml b/.github/workflows/pr-env-close-unlabel.ymlindex ded063cf480..0d62d31155c 100644--- a/.github/workflows/pr-env-close-unlabel.yml+++ b/.github/workflows/pr-env-close-unlabel.yml@@ -5,8 +5,8 @@ on:types: [ closed, unlabeled ]concurrency:- group: ${{ github.workflow }}-${{ github.ref }}- cancel-in-progress: true+ group: ${{ github.workflow }}-${{ github.event.pull_request.number }}+ cancel-in-progress: falsejobs:pr-env:diff --git a/.github/workflows/pr-env-destroy-manual.yml b/.github/workflows/pr-env-destroy-manual.ymlnew file mode 100644index 00000000000..9deec0a2645--- /dev/null+++ b/.github/workflows/pr-env-destroy-manual.yml@@ -0,0 +1,29 @@+name: PR Env Destroy (Manual)++on:+ workflow_dispatch:+ inputs:+ pr_number:+ description: 'PR number to destroy environment for'+ required: true+ type: string+ self_hosting:+ description: 'Self-hosting stack'+ type: boolean+ default: false++jobs:+ approve:+ runs-on: ubuntu-latest+ environment: pr-env-admin+ steps:+ - name: Approved+ run: echo "Destroying PR environment for PR #${{ inputs.pr_number }}"++ destroy:+ needs: approve+ uses: ./.github/workflows/pr-env-destroy.yml+ secrets: inherit+ with:+ self_hosting: ${{ inputs.self_hosting }}+ pr_number: ${{ inputs.pr_number }}diff --git a/.github/workflows/pr-env-destroy.yml b/.github/workflows/pr-env-destroy.ymlindex ca3733cd2d1..e88d9aaca43 100644--- a/.github/workflows/pr-env-destroy.yml+++ b/.github/workflows/pr-env-destroy.yml@@ -9,6 +9,13 @@ on:required: falsetype: booleandefault: false+ pr_number:+ description: 'PR number (required for manual dispatch)'+ required: false+ type: string++env:+ PR_NUMBER: ${{ inputs.pr_number || github.event.number }}jobs:destroy_pr:@@ -62,8 +69,8 @@ jobs:- name: Destroy PR Review ENVif: ${{ !inputs.self_hosting }}run: |- kubectl delete metabase -n hosting-pr${{ github.event.number }} hosting-pr${{ github.event.number }}- kubectl delete ns hosting-pr${{ github.event.number }}+ kubectl delete metabase -n hosting-pr${{ env.PR_NUMBER }} hosting-pr${{ env.PR_NUMBER }}+ kubectl delete ns hosting-pr${{ env.PR_NUMBER }}- name: Setup Helmif: ${{ inputs.self_hosting }}uses: azure/setup-helm@v4@@ -72,8 +79,8 @@ jobs:- name: Destroy PR Review ENV (self-hosting)if: ${{ inputs.self_hosting }}run: |- helm uninstall hosting-pr${{ github.event.number }} --namespace hosting-pr${{ github.event.number }} || true- kubectl delete ns hosting-pr${{ github.event.number }} || true+ helm uninstall hosting-pr${{ env.PR_NUMBER }} --namespace hosting-pr${{ env.PR_NUMBER }} || true+ kubectl delete ns hosting-pr${{ env.PR_NUMBER }} || true- name: Setup psql clientrun: |sudo apt-get update@@ -85,4 +92,4 @@ jobs:-h ${{ secrets.PR_ENV_DB_HOST }} \-U ${{ secrets.PR_ENV_DB_USER }} \-d ${{ secrets.PR_ENV_DB_NAME }} \- -c "DROP DATABASE IF EXISTS hosting_pr${{ github.event.number }};"+ -c "DROP DATABASE IF EXISTS hosting_pr${{ env.PR_NUMBER }};"