Merge pull request #159 from Azure/5.3.0.preview3

March 2021 - 5.3.0
Azure · Apr 9, 2021 · 2e227c3 · 2e227c3
2 parents 23d4ce9 + 6620ea9
commit 2e227c3
Show file tree

Hide file tree

Showing 263 changed files with 3,325 additions and 3,850 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -6,7 +6,7 @@
   version: '3.7'
   services:
     rover:
-      image: aztfmod/rover:0.13.6-2103.0304
+      image: aztfmod/rover:0.14.10-2104.0803
       user: vscode
 
       labels:

diff --git a/.github/workflows/landingzones.yml → .github/workflows/landingzones-tf13.yml b/.github/workflows/landingzones.yml → .github/workflows/landingzones-tf13.yml
@@ -3,23 +3,11 @@
 # Licensed under the MIT License.
 #
 
-name: landingzones
-
+name: landingzones-tf13
+  
 on:
-  pull_request:
-    paths-ignore:
-      - 'documentation/**'
-      - '_pictures/**'
-      - 'README.md'
-      - 'CHANGELOG.md'
-  push:
-    paths-ignore:
-      - 'documentation/**'
-      - '_pictures/**'
-      - 'README.md'
-      - 'CHANGELOG.md'
   schedule:
-    - cron:  '0 4 * * *'
+    - cron:  '0 2 * * *'
 
 env:
   TF_CLI_ARGS: '-no-color'
@@ -42,7 +30,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/rover:0.13.6-2103.0304
+      image: aztfmod/rover:0.13.6-2104.0803
       options: --user 0
 
     steps:
@@ -57,8 +45,8 @@ jobs:
 
       - name: launchpad
         run: |
-          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/landingzones/caf_launchpad -a apply \
-            -var-folder ${GITHUB_WORKSPACE}/landingzones/caf_launchpad/scenario/100 \
+          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_launchpad -a apply \
+            -var-folder ${GITHUB_WORKSPACE}/caf_launchpad/scenario/100 \
             -level level0 \
             -launchpad \
             -parallelism=30 \
@@ -69,10 +57,13 @@ jobs:
 
       - name: foundations
         run: |
-          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/landingzones/caf_foundations -a apply \
+          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_solution -a apply \
+            -var-folder ${GITHUB_WORKSPACE}/caf_solution/scenario/foundations/100-passthrough \
+            -tfstate caf_foundations.tfstate \
             -level level1 \
             -parallelism=30 \
-            --environment ${{ github.run_id }}
+            --environment ${{ github.run_id }} \
+            '-var tags={testing_job_id="${{ github.run_id }}"}'
 
   networking100:
     name: networking-100
@@ -84,14 +75,14 @@ jobs:
       fail-fast: false
       matrix:
           config_files: [
-            "caf_networking/scenario/100-single-region-hub",
-            "caf_networking/scenario/101-multi-region-hub",
-            "caf_networking/scenario/105-hub-and-spoke",
-            "caf_networking/scenario/106-hub-virtual-wan-firewall"
+            "caf_solution/scenario/networking/100-single-region-hub",
+            "caf_solution/scenario/networking/101-multi-region-hub",
+            "caf_solution/scenario/networking/105-hub-and-spoke",
+            "caf_solution/scenario/networking/106-hub-virtual-wan-firewall"
           ]
 
     container:
-      image: aztfmod/rover:0.13.6-2103.0304
+      image: aztfmod/rover:0.13.6-2104.0803
       options: --user 0
 
     steps:
@@ -104,20 +95,20 @@ jobs:
 
       - name: deploy example
         run: |
-          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/landingzones/caf_networking/ -a apply \
+          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_solution/ -a apply \
             -tfstate $(basename ${{ matrix.config_files }}).tfstate \
             -level level2 \
             -parallelism=30 \
-            -var-folder ${GITHUB_WORKSPACE}/landingzones/${{ matrix.config_files }} \
+            -var-folder ${GITHUB_WORKSPACE}/${{ matrix.config_files }} \
             --environment ${{ github.run_id }}
 
       - name: destroy example
         run: |
-          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/landingzones/caf_networking/ -a destroy \
+          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_solution/ -a destroy \
             -tfstate $(basename ${{ matrix.config_files }}).tfstate \
             -level level2 \
             -parallelism=30 \
-            -var-folder ${GITHUB_WORKSPACE}/landingzones/${{ matrix.config_files }} \
+            -var-folder ${GITHUB_WORKSPACE}/${{ matrix.config_files }} \
             --environment ${{ github.run_id }} \
             -refresh=false \
             -auto-approve
@@ -135,7 +126,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/rover:0.13.6-2103.0304
+      image: aztfmod/rover:0.13.6-2104.0803
       options: --user 0
 
     steps:
@@ -150,8 +141,8 @@ jobs:
 
       - name: launchpad-200-upgrade
         run: |
-          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/landingzones/caf_launchpad -a apply \
-            -var-folder ${GITHUB_WORKSPACE}/landingzones/caf_launchpad/scenario/200 \
+          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_launchpad -a apply \
+            -var-folder ${GITHUB_WORKSPACE}/caf_launchpad/scenario/200 \
             -level level0 \
             -launchpad \
             -parallelism=30 \
@@ -162,9 +153,13 @@ jobs:
 
       - name: foundations-200-upgrade
         run: |
-          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/landingzones/caf_foundations -a apply \
-          -level level1 \
-          --environment ${{ github.run_id }}
+          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_solution -a apply \
+            -var-folder ${GITHUB_WORKSPACE}/caf_solution/scenario/foundations/gitops \
+            -tfstate caf_foundations.tfstate \
+            -level level1 \
+            -parallelism=30 \
+            --environment ${{ github.run_id }} \
+            '-var tags={testing_job_id="${{ github.run_id }}"}'
 
   networking200:
     name: networking-200
@@ -176,13 +171,13 @@ jobs:
       fail-fast: false
       matrix:
           config_files: [
-            "caf_networking/scenario/200-single-region-hub",
-            "caf_networking/scenario/201-multi-region-hub",
-            "caf_networking/scenario/210-aks-private"
+            "caf_solution/scenario/networking/200-single-region-hub",
+            "caf_solution/scenario/networking/201-multi-region-hub",
+            "caf_solution/scenario/networking/210-aks-private"
           ]
 
     container:
-      image: aztfmod/rover:0.13.6-2103.0304
+      image: aztfmod/rover:0.13.6-2104.0803
       options: --user 0
 
     steps:
@@ -195,20 +190,20 @@ jobs:
 
       - name: deploy example
         run: |
-          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/landingzones/caf_networking/ -a apply \
+          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_solution/ -a apply \
             -tfstate $(basename ${{ matrix.config_files }}).tfstate \
             -level level2 \
             -parallelism=30 \
-            -var-folder ${GITHUB_WORKSPACE}/landingzones/${{ matrix.config_files }} \
+            -var-folder ${GITHUB_WORKSPACE}/${{ matrix.config_files }} \
             --environment ${{ github.run_id }}
 
       - name: destroy example
         run: |
-          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/landingzones/caf_networking/ -a destroy \
+          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_solution/ -a destroy \
             -tfstate $(basename ${{ matrix.config_files }}).tfstate \
             -level level2 \
             -parallelism=30 \
-            -var-folder ${GITHUB_WORKSPACE}/landingzones/${{ matrix.config_files }} \
+            -var-folder ${GITHUB_WORKSPACE}/${{ matrix.config_files }} \
             --environment ${{ github.run_id }} \
             -refresh=false \
             -auto-approve
@@ -225,7 +220,7 @@ jobs:
         random_length: ['5']
 
     container:
-      image: aztfmod/rover:0.13.6-2103.0304
+      image: aztfmod/rover:0.13.6-2104.0803
       options: --user 0
 
     steps:
@@ -240,16 +235,19 @@ jobs:
 
       - name: foundations
         run: |
-          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/landingzones/caf_foundations -a destroy \
+          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_solution -a destroy \
+            -var-folder ${GITHUB_WORKSPACE}/caf_solution/scenario/foundations/gitops \
+            -tfstate caf_foundations.tfstate \
             -level level1 \
             -parallelism=30 \
             --environment ${{ github.run_id }} \
+            '-var tags={testing_job_id="${{ github.run_id }}"}' \
             -auto-approve
 
       - name: Remove launchpad
         run: |
-          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/landingzones/caf_launchpad -a destroy \
-            -var-folder ${GITHUB_WORKSPACE}/landingzones/caf_launchpad/scenario/200 \
+          /tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_launchpad -a destroy \
+            -var-folder ${GITHUB_WORKSPACE}/caf_launchpad/scenario/200 \
             -level level0 \
             -launchpad \
             -parallelism=30 \