diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 84781b417a..89e12360f9 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -866,9 +866,9 @@ jobs: GH_TOKEN: ${{ github.token }} run: | if [[ "$GITHUB_REF_NAME" == "main" ]]; then - gh workflow run deploy-dev.yml --ref ${{ github.sha }} -f dockerTag=${{needs.tag.outputs.build-tag}} + gh workflow run deploy-dev.yml --ref main -f branch=${{ github.sha }} -f dockerTag=${{needs.tag.outputs.build-tag}} elif [[ "$GITHUB_REF_NAME" == "release" ]]; then - gh workflow run deploy-prod.yml --ref ${{ github.sha }} -f dockerTag=${{needs.tag.outputs.build-tag}} + gh workflow run deploy-prod.yml --ref release -f branch=${{ github.sha }} -f dockerTag=${{needs.tag.outputs.build-tag}} else echo "GITHUB_REF_NAME (value '$GITHUB_REF_NAME') is not set to either 'main' or 'release'" exit 1 diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 6433cf5c6e..409517bf63 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -7,18 +7,23 @@ on: description: 'Docker tag to deploy' required: true type: string + branch: + description: 'Branch or commit used for deploy scripts and configs' + required: true + type: string + default: 'main' deployStorage: - description: 'Should storage be deployed' + description: 'Deploy storage' required: true type: boolean default: true deployProxy: - description: 'Should proxy be deployed' + description: 'Deploy proxy' required: true type: boolean default: true deployStorageBroker: - description: 'Should storage-broker be deployed' + description: 'Deploy storage-broker' required: true type: boolean default: true @@ -52,6 +57,7 @@ jobs: with: submodules: true fetch-depth: 0 + ref: ${{ inputs.branch }} - name: Redeploy run: | @@ -93,6 +99,7 @@ jobs: with: submodules: true fetch-depth: 0 + ref: ${{ inputs.branch }} - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1-node16 @@ -149,6 +156,7 @@ jobs: with: submodules: true fetch-depth: 0 + ref: ${{ inputs.branch }} - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1-node16 diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 0b4ecdeaa4..e1954b5540 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -7,18 +7,23 @@ on: description: 'Docker tag to deploy' required: true type: string + branch: + description: 'Branch or commit used for deploy scripts and configs' + required: true + type: string + default: 'main' deployStorage: - description: 'Should storage be deployed' + description: 'Deploy storage' required: true type: boolean default: true deployProxy: - description: 'Should proxy be deployed' + description: 'Deploy proxy' required: true type: boolean default: true deployStorageBroker: - description: 'Should storage-broker be deployed' + description: 'Deploy storage-broker' required: true type: boolean default: true @@ -46,6 +51,7 @@ jobs: with: submodules: true fetch-depth: 0 + ref: ${{ inputs.branch }} - name: Redeploy run: | @@ -92,6 +98,7 @@ jobs: with: submodules: true fetch-depth: 0 + ref: ${{ inputs.branch }} - name: Configure environment run: | @@ -141,6 +148,7 @@ jobs: with: submodules: true fetch-depth: 0 + ref: ${{ inputs.branch }} - name: Configure environment run: | @@ -168,6 +176,7 @@ jobs: with: submodules: true fetch-depth: 0 + ref: ${{ inputs.branch }} - name: Redeploy run: | @@ -214,6 +223,7 @@ jobs: with: submodules: true fetch-depth: 0 + ref: ${{ inputs.branch }} - name: Store kubeconfig file run: | @@ -249,6 +259,7 @@ jobs: with: submodules: true fetch-depth: 0 + ref: ${{ inputs.branch }} - name: Store kubeconfig file run: |