fix(pipelines): remove broken bash step, clean up vars (#39)

Azure · Nov 3, 2021 · 7ba5c65 · 7ba5c65
1 parent f5c5002
commit 7ba5c65
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/azure-pipelines/cd.yaml b/azure-pipelines/cd.yaml
@@ -19,9 +19,9 @@ pool:
 
 variables:
 - template: vars/global.yaml
-- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
+- ${{ if eq(variables.isMain, 'True') }}:
   - group: e2e-gov-demo-dev-kv
-- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/production') }}:
+- ${{ if eq(variables.isProduction, 'True') }}:
   - group: e2e-gov-demo-kv
 
 stages:
@@ -34,7 +34,6 @@ stages:
     displayName: Terraform Plan and Apply
     steps:
     - template: steps/debug-vars.yaml
-    - template: steps/confirm-kv-loaded.yaml
     - template: steps/terraform-init.yaml
     - template: steps/terraform-plan.yaml
       parameters:

diff --git a/azure-pipelines/ci.yaml b/azure-pipelines/ci.yaml
@@ -3,7 +3,6 @@ name: $(BuildID)
 trigger:
   branches:
     include:
-    - main
     - feat/*
     - fix/*
   paths:

diff --git a/azure-pipelines/steps/confirm-kv-loaded.yaml b/azure-pipelines/steps/confirm-kv-loaded.yaml
diff --git a/azure-pipelines/steps/debug-vars.yaml b/azure-pipelines/steps/debug-vars.yaml
@@ -4,7 +4,7 @@ steps:
     echo "---------"
     echo "Debugging"
     echo "---------"
-    echo  "isMain: ${{ variables.isMain }}"
-    echo  "isProduction: ${{ variables.isProduction }}"
+    echo  "isMain: $(isMain)"
+    echo  "isProduction: $(isProduction)"
     echo  "Build.SourceBranch: ${{ variables['Build.SourceBranch'] }}"
   displayName: Debug - Branch Variables