Merge pull request #289 from Azure/2112.int

January 2022 Release

.devcontainer/devcontainer.json

@@ -20,7 +20,7 @@
     "settings": {
         "files.eol": "\n",
         "editor.tabSize": 2,
-        "terminal.integrated.scrollback": 32000,
+        "terminal.integrated.scrollback": 64000,
     },
 
     // Uncomment the next line if you want start specific services in your Docker Compose config.
@@ -30,13 +30,11 @@
     // "shutdownAction": "none",
 
     // Uncomment the next line to run commands after the container is created.
-    "postCreateCommand": "sudo cp -R /tmp/.ssh-localhost/* ~/.ssh && sudo chown -R $(whoami):$(whoami) /tf/caf ~/.ssh && sudo chmod 400 ~/.ssh/* && git config --global core.editor vi && pre-commit install && pre-commit autoupdate",
-
+    "postCreateCommand": "sudo cp -R /tmp/.ssh-localhost/* ~/.ssh && sudo chown -R $(whoami):$(whoami) /tf/caf ~/.ssh && sudo chmod 400 ~/.ssh/* && git config --global core.editor vim && pre-commit install && pre-commit autoupdate",
+    
     // Add the IDs of extensions you want installed when the container is created in the array below.
     "extensions": [
         "4ops.terraform",
-        "mutantdino.resourcemonitor",
-        "ms-azure-devops.azure-pipelines",
-        "omartawfik.github-actions-vscode"
+        "mutantdino.resourcemonitor"
     ]
 }

.devcontainer/docker-compose.yml

@@ -6,7 +6,7 @@
   version: '3.7'
   services:
     rover:
-      image: aztfmod/rover:1.0.9-2111.0103
+      image: aztfmod/rover:1.1.3-2201.2106
       user: vscode
 
       labels:

.github/workflows/landingzones-tf100.yml

@@ -23,6 +23,8 @@ env:
   ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
   ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
   ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
+  TF_REGISTRY_DISCOVERY_RETRY: 5
+  TF_REGISTRY_CLIENT_TIMEOUT: 15
   ROVER_RUNNER: true
 
 jobs:
@@ -37,7 +39,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/rover:1.0.9-2111.0103
+      image: aztfmod/rover:1.1.3-2201.2106
       options: --user 0
 
     steps:
@@ -64,7 +66,7 @@ jobs:
 
       - name: foundations
         run: |
-          sleep 120
+          sleep 180
           /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 \
@@ -90,7 +92,7 @@ jobs:
           ]
 
     container:
-      image: aztfmod/rover:1.0.9-2111.0103
+      image: aztfmod/rover:1.1.3-2201.2106
       options: --user 0
 
     steps:
@@ -118,7 +120,7 @@ jobs:
             -parallelism=30 \
             -var-folder ${GITHUB_WORKSPACE}/${{ matrix.config_files }} \
             --environment ${{ github.run_id }} \
-            -refresh=false 
+            -refresh=false
 
   foundations200:
     name: foundations-200
@@ -133,7 +135,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/rover:1.0.9-2111.0103
+      image: aztfmod/rover:1.1.3-2201.2106
       options: --user 0
 
     steps:
@@ -184,7 +186,7 @@ jobs:
           ]
 
     container:
-      image: aztfmod/rover:1.0.9-2111.0103
+      image: aztfmod/rover:1.1.3-2201.2106
       options: --user 0
 
     steps:
@@ -212,7 +214,7 @@ jobs:
             -parallelism=30 \
             -var-folder ${GITHUB_WORKSPACE}/${{ matrix.config_files }} \
             --environment ${{ github.run_id }} \
-            -refresh=false 
+            -refresh=false
 
   foundations_destroy:
     name: foundations_destroy
@@ -226,7 +228,7 @@ jobs:
         random_length: ['5']
 
     container:
-      image: aztfmod/rover:1.0.9-2111.0103
+      image: aztfmod/rover:1.1.3-2201.2106
       options: --user 0
 
     steps: