From c38d2f1f71969dd9b24d32ac8c37a274a4fc3d3a Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 13 Jul 2023 06:38:45 +0000 Subject: [PATCH 1/6] Update rover --- .devcontainer/docker-compose.yml | 2 +- .github/workflows/standalone-networking.yaml | 4 ++-- .github/workflows/standalone-regressor-tf100.yaml | 4 ++-- .github/workflows/standalone-tf100.yaml | 4 ++-- rover_on_ssh_host.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 783cebee19..2f243e0065 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,7 +6,7 @@ version: '3.7' services: rover: - image: aztfmod/rover:1.4.6-2306.2308 + image: aztfmod/rover:1.5.2-2307.0508 user: vscode labels: diff --git a/.github/workflows/standalone-networking.yaml b/.github/workflows/standalone-networking.yaml index c368648d54..cb99dcb586 100644 --- a/.github/workflows/standalone-networking.yaml +++ b/.github/workflows/standalone-networking.yaml @@ -46,7 +46,7 @@ jobs: matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}} container: - image: aztfmod/rover:1.4.6-2305.1807 + image: aztfmod/rover:1.5.2-2307.0508 options: --user 0 steps: @@ -131,7 +131,7 @@ jobs: needs: [testcases] container: - image: aztfmod/rover:1.4.6-2305.1807 + image: aztfmod/rover:1.5.2-2307.0508 options: --user 0 steps: diff --git a/.github/workflows/standalone-regressor-tf100.yaml b/.github/workflows/standalone-regressor-tf100.yaml index a20fec51dd..78051c4ca8 100644 --- a/.github/workflows/standalone-regressor-tf100.yaml +++ b/.github/workflows/standalone-regressor-tf100.yaml @@ -58,7 +58,7 @@ jobs: matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}} container: - image: aztfmod/rover:1.4.6-2305.1807 + image: aztfmod/rover:1.5.2-2307.0508 options: --user 0 steps: @@ -178,7 +178,7 @@ jobs: needs: [testcases] container: - image: aztfmod/rover:1.4.6-2305.1807 + image: aztfmod/rover:1.5.2-2307.0508 options: --user 0 steps: diff --git a/.github/workflows/standalone-tf100.yaml b/.github/workflows/standalone-tf100.yaml index e10edc87e3..023804d1f0 100644 --- a/.github/workflows/standalone-tf100.yaml +++ b/.github/workflows/standalone-tf100.yaml @@ -55,7 +55,7 @@ jobs: matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}} container: - image: aztfmod/rover:1.4.6-2305.1807 + image: aztfmod/rover:1.5.2-2307.0508 options: --user 0 steps: @@ -140,7 +140,7 @@ jobs: needs: [testcases] container: - image: aztfmod/rover:1.4.6-2305.1807 + image: aztfmod/rover:1.5.2-2307.0508 options: --user 0 steps: diff --git a/rover_on_ssh_host.yml b/rover_on_ssh_host.yml index 1674019326..35d3e5562f 100644 --- a/rover_on_ssh_host.yml +++ b/rover_on_ssh_host.yml @@ -11,7 +11,7 @@ version: '3.7' services: rover: - image: aztfmod/rover:1.4.6-2305.1807 + image: aztfmod/rover:1.5.2-2307.0508 user: vscode From 0d16ad271bfb597f2abe540dcf9fdf63d6b3060b Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 13 Jul 2023 06:42:25 +0000 Subject: [PATCH 2/6] Rover update --- .github/workflows/landingzone-scenarios.yaml | 2 +- .github/workflows/rover.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/landingzone-scenarios.yaml b/.github/workflows/landingzone-scenarios.yaml index a86c9306e3..b3fc3b4e93 100644 --- a/.github/workflows/landingzone-scenarios.yaml +++ b/.github/workflows/landingzone-scenarios.yaml @@ -86,7 +86,7 @@ jobs: needs: [job] container: - image: aztfmod/rover:1.4.6-2305.1701 + image: aztfmod/rover:1.5.2-2307.0508 options: --user 0 steps: diff --git a/.github/workflows/rover.yaml b/.github/workflows/rover.yaml index fc26ccd5ca..9f45244382 100644 --- a/.github/workflows/rover.yaml +++ b/.github/workflows/rover.yaml @@ -46,7 +46,7 @@ jobs: needs: rover_setup container: - image: aztfmod/rover:1.4.6-2305.1701 + image: aztfmod/rover:1.5.2-2307.0508 options: --user 0 env: From 334b2f89af3b8a25444a96ca2120da6f543bf70c Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 13 Jul 2023 06:46:02 +0000 Subject: [PATCH 3/6] Provider update scripts --- .github/scripts/azuread_latest.go | 74 +++++++++++++++++++++++++++++++ .github/scripts/azurerm_latest.go | 74 +++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 .github/scripts/azuread_latest.go create mode 100644 .github/scripts/azurerm_latest.go diff --git a/.github/scripts/azuread_latest.go b/.github/scripts/azuread_latest.go new file mode 100644 index 0000000000..fb3716dca9 --- /dev/null +++ b/.github/scripts/azuread_latest.go @@ -0,0 +1,74 @@ +package main + +import ( + "io/ioutil" + "log" + "net/http" + "regexp" + "strings" +) + +func getLatestVersion() (string, error) { + resp, err := http.Get("https://api.github.com/repos/hashicorp/terraform-provider-azuread/releases/latest") + if err != nil { + return "", err + } + defer resp.Body.Close() + + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + return "", err + } + + versionRegex := regexp.MustCompile(`"tag_name"\s*:\s*"v?(.*?)"`) + match := versionRegex.FindStringSubmatch(string(body)) + if len(match) < 2 { + return "", nil + } + + return match[1], nil +} + +func updateVersion(filename, currentVersion, newVersion string) error { + content, err := ioutil.ReadFile(filename) + if err != nil { + return err + } + + updatedContent := strings.ReplaceAll(string(content), currentVersion, newVersion) + + err = ioutil.WriteFile(filename, []byte(updatedContent), 0644) + if err != nil { + return err + } + + return nil +} + +func main() { + filename := "main.tf" + currentVersionRegex := regexp.MustCompile(`source\s*=\s*"hashicorp/azuread"\s*\n\s*version\s*=\s*"~>\s*v?(\d+\.\d+\.\d+)"`) + + content, err := ioutil.ReadFile(filename) + if err != nil { + log.Fatal(err) + } + + matches := currentVersionRegex.FindStringSubmatch(string(content)) + if len(matches) < 2 { + log.Fatal("No azuread provider version found in the file.") + } + + currentVersion := matches[1] + latestVersion, err := getLatestVersion() + if err != nil { + log.Fatal("Failed to retrieve the latest version from GitHub releases.") + } + + err = updateVersion(filename, currentVersion, latestVersion) + if err != nil { + log.Fatal(err) + } + + log.Printf("Successfully updated azuread provider version from %s to %s.", currentVersion, latestVersion) +} diff --git a/.github/scripts/azurerm_latest.go b/.github/scripts/azurerm_latest.go new file mode 100644 index 0000000000..c83f14b949 --- /dev/null +++ b/.github/scripts/azurerm_latest.go @@ -0,0 +1,74 @@ +package main + +import ( + "io/ioutil" + "log" + "net/http" + "regexp" + "strings" +) + +func getLatestVersion() (string, error) { + resp, err := http.Get("https://api.github.com/repos/hashicorp/terraform-provider-azurerm/releases/latest") + if err != nil { + return "", err + } + defer resp.Body.Close() + + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + return "", err + } + + versionRegex := regexp.MustCompile(`"tag_name"\s*:\s*"v?(.*?)"`) + match := versionRegex.FindStringSubmatch(string(body)) + if len(match) < 2 { + return "", nil + } + + return match[1], nil +} + +func updateVersion(filename, currentVersion, newVersion string) error { + content, err := ioutil.ReadFile(filename) + if err != nil { + return err + } + + updatedContent := strings.ReplaceAll(string(content), currentVersion, newVersion) + + err = ioutil.WriteFile(filename, []byte(updatedContent), 0644) + if err != nil { + return err + } + + return nil +} + +func main() { + filename := "main.tf" + currentVersionRegex := regexp.MustCompile(`version\s*=\s*"~>\s*v?(\d+\.\d+\.\d+)"`) + + content, err := ioutil.ReadFile(filename) + if err != nil { + log.Fatal(err) + } + + matches := currentVersionRegex.FindStringSubmatch(string(content)) + if len(matches) < 2 { + log.Fatal("No azurerm provider version found in the file.") + } + + currentVersion := matches[1] + latestVersion, err := getLatestVersion() + if err != nil { + log.Fatal("Failed to retrieve the latest version from GitHub releases.") + } + + err = updateVersion(filename, currentVersion, latestVersion) + if err != nil { + log.Fatal(err) + } + + log.Printf("Successfully updated azurerm provider version from %s to %s.", currentVersion, latestVersion) +} From 9b66b6523cf2e47c6fa0f035bb0a056ef4f2a765 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 13 Jul 2023 07:14:25 +0000 Subject: [PATCH 4/6] Update for compute workflows --- .github/workflows/standalone-compute.yaml | 152 ++++++++++++++++++ aks_clusters.tf => compute_aks_clusters.tf | 0 ...ty_sets.tf => compute_availability_sets.tf | 0 ...ft.tf => compute_azure_redhat_openshift.tf | 0 ...h_accounts.tf => compute_batch_accounts.tf | 0 ...ations.tf => compute_batch_applications.tf | 0 ...icates.tf => compute_batch_certificates.tf | 0 batch_jobs.tf => compute_batch_jobs.tf | 0 batch_pools.tf => compute_batch_pools.tf | 0 ...r_groups.tf => compute_container_groups.tf | 0 ...gistry.tf => compute_container_registry.tf | 0 ...ted_hosts.tf => compute_dedicated_hosts.tf | 0 ...f => compute_proximity_placement_groups.tf | 0 ...machines.tf => compute_virtual_machines.tf | 0 ... => compute_virtual_machines_extensions.tf | 0 ... => compute_virtual_machines_scale_sets.tf | 0 ..._virtual_machines_scale_sets_extensions.tf | 0 ..._clusters.tf => compute_vmware_clusters.tf | 0 ...ps.tf => compute_wvd_application_groups.tf | 0 ...ications.tf => compute_wvd_applications.tf | 0 ...host_pools.tf => compute_wvd_host_pools.tf | 0 ...workspaces.tf => compute_wvd_workspaces.tf | 0 22 files changed, 152 insertions(+) create mode 100644 .github/workflows/standalone-compute.yaml rename aks_clusters.tf => compute_aks_clusters.tf (100%) rename availability_sets.tf => compute_availability_sets.tf (100%) rename azure_redhat_openshift.tf => compute_azure_redhat_openshift.tf (100%) rename batch_accounts.tf => compute_batch_accounts.tf (100%) rename batch_applications.tf => compute_batch_applications.tf (100%) rename batch_certificates.tf => compute_batch_certificates.tf (100%) rename batch_jobs.tf => compute_batch_jobs.tf (100%) rename batch_pools.tf => compute_batch_pools.tf (100%) rename container_groups.tf => compute_container_groups.tf (100%) rename container_registry.tf => compute_container_registry.tf (100%) rename dedicated_hosts.tf => compute_dedicated_hosts.tf (100%) rename proximity_placement_groups.tf => compute_proximity_placement_groups.tf (100%) rename virtual_machines.tf => compute_virtual_machines.tf (100%) rename virtual_machines_extensions.tf => compute_virtual_machines_extensions.tf (100%) rename virtual_machines_scale_sets.tf => compute_virtual_machines_scale_sets.tf (100%) rename virtual_machines_scale_sets_extensions.tf => compute_virtual_machines_scale_sets_extensions.tf (100%) rename vmware_clusters.tf => compute_vmware_clusters.tf (100%) rename wvd_application_groups.tf => compute_wvd_application_groups.tf (100%) rename wvd_applications.tf => compute_wvd_applications.tf (100%) rename wvd_host_pools.tf => compute_wvd_host_pools.tf (100%) rename wvd_workspaces.tf => compute_wvd_workspaces.tf (100%) diff --git a/.github/workflows/standalone-compute.yaml b/.github/workflows/standalone-compute.yaml new file mode 100644 index 0000000000..b9bcf481fd --- /dev/null +++ b/.github/workflows/standalone-compute.yaml @@ -0,0 +1,152 @@ +# +# Copyright (c) Microsoft Corporation +# Licensed under the MIT License. +# + +name: standalone-compute + +on: + push: + paths: + - 'compute_*' + - 'modules/compute/**' + - 'examples/compute/**' + - '.github/workflows/*compute.*' + +env: + TF_CLI_ARGS: "-no-color" + TF_CLI_ARGS_destroy: "-auto-approve -refresh=false" + ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} + 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: + load_scenarios: + runs-on: ubuntu-latest + outputs: + matrix: ${{ steps.load_scenarios.outputs.matrix }} + steps: + - uses: actions/checkout@v3 + - id: load_scenarios + run: | + cases=$(cat ./.github/workflows/standalone-compute.json | jq -c .) + echo "matrix=${cases}" >> $GITHUB_OUTPUT + + testcases: + name: test + runs-on: ubuntu-latest + needs: load_scenarios + + strategy: + fail-fast: false + matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}} + + container: + image: aztfmod/rover:1.5.2-2307.0508 + options: --user 0 + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Create environment variables + run: | + cd ${GITHUB_WORKSPACE}/examples/${{ matrix.config_files }} + FILE_NAME=$(echo ${{ matrix.config_files }} | sed 's./..g' | xargs) + echo STATE_FILE=${TF_DATA_DIR}/tfstates/${FILE_NAME}.tfstate >> $GITHUB_ENV + echo PLAN_FILE=${TF_DATA_DIR}/tfstates/${FILE_NAME}.plan >> $GITHUB_ENV + echo CURRENT_FOLDER=${GITHUB_WORKSPACE}/examples/${{ matrix.config_files }} >> $GITHUB_ENV + echo PARAMETER_FILES=$(find ${GITHUB_WORKSPACE}/examples/${{ matrix.config_files }} | grep .tfvars | sed 's/.*/-var-file=&/' | xargs) >> $GITHUB_ENV + + - name: Login azure + run: | + az login --service-principal -u '${{ env.ARM_CLIENT_ID }}' -p '${{ env.ARM_CLIENT_SECRET }}' --tenant '${{ env.ARM_TENANT_ID }}' + az account set -s ${{ env.ARM_SUBSCRIPTION_ID }} + + - name: Terraform Init example + id: tf_init + run: | + terraform -chdir=${GITHUB_WORKSPACE}/examples \ + init -upgrade=true | grep -P '^- (?=Downloading|Using|Finding|Installing)|^[^-]' + + - name: Terraform Plan example + id: tf_plan + run: | + terraform -chdir=${GITHUB_WORKSPACE}/examples \ + plan \ + ${{ env.PARAMETER_FILES }} \ + -var tags='{testing_job_id='"${{ github.run_id }}"'}' \ + -var var_folder_path=${{ env.CURRENT_FOLDER }} \ + -refresh=true \ + -input=false \ + -state=${{ env.STATE_FILE }} \ + -out=${{ env.PLAN_FILE }} + + - name: Terraform Apply example + id: tf_apply + if: steps.tf_plan.outcome == 'success' + run: | + terraform -chdir=${GITHUB_WORKSPACE}/examples \ + apply \ + -parallelism=30 \ + -state=${{ env.STATE_FILE }} \ + ${{ env.PLAN_FILE }} + + - name: Terraform Destroy planning example + id: tf_destroy_plan + if: steps.tf_plan.outcome == 'success' + run: | + terraform -chdir=${GITHUB_WORKSPACE}/examples \ + plan \ + ${{ env.PARAMETER_FILES }} \ + -var tags='{testing_job_id='"${{ github.run_id }}"'}' \ + -var var_folder_path=${{ env.CURRENT_FOLDER }} \ + -refresh=true \ + -input=false \ + -destroy \ + -state=${{ env.STATE_FILE }} \ + -out=${{ env.PLAN_FILE }}-destroy + + - name: Terraform Destroy apply example + id: tf_destroy_apply + if: steps.tf_destroy_plan.outcome == 'success' + run: | + terraform -chdir=${GITHUB_WORKSPACE}/examples \ + apply \ + -refresh=false \ + -parallelism=30 \ + -auto-approve \ + -state=${{ env.STATE_FILE }} \ + ${{ env.PLAN_FILE }}-destroy + + purge: + name: purge + runs-on: ubuntu-latest + if: ${{ failure() || cancelled() }} + + needs: [testcases] + + container: + image: aztfmod/rover:1.5.2-2307.0508 + options: --user 0 + + steps: + - name: Login azure + run: | + az login --service-principal -u '${{ env.ARM_CLIENT_ID }}' -p '${{ env.ARM_CLIENT_SECRET }}' --tenant '${{ env.ARM_TENANT_ID }}' + az account set -s ${{ env.ARM_SUBSCRIPTION_ID }} + + - name: Complete purge + run: | + for i in `az monitor diagnostic-settings subscription list -o tsv --query "value[?contains(name, '${{ github.run_id }}' )].name"`; do echo "purging subscription diagnostic-settings: $i" && $(az monitor diagnostic-settings subscription delete --name $i --yes); done + for i in `az monitor log-profiles list -o tsv --query '[].name'`; do az monitor log-profiles delete --name $i; done + for i in `az ad group list --query "[?contains(displayName, '${{ github.run_id }}')].id" -o tsv`; do echo "purging Azure AD group: $i" && $(az ad group delete --verbose --group $i || true); done + for i in `az ad app list --query "[?contains(displayName, '${{ github.run_id }}')].appId" -o tsv`; do echo "purging Azure AD app: $i" && $(az ad app delete --verbose --id $i || true); done + for i in `az keyvault list-deleted --query "[?tags.testing_job_id=='${{ github.run_id }}'].name" -o tsv`; do az keyvault purge --name $i; done + for i in `az group list --query "[?tags.testing_job_id=='${{ github.run_id }}'].name" -o tsv`; do echo "purging resource group: $i" && $(az group delete -n $i -y --no-wait || true); done + for i in `az role assignment list --query "[?contains(roleDefinitionName, '${{ github.run_id }}')].roleDefinitionName" -o tsv`; do echo "purging role assignment: $i" && $(az role assignment delete --role $i || true); done + for i in `az role definition list --query "[?contains(roleName, '${{ github.run_id }}')].roleName" -o tsv`; do echo "purging custom role definition: $i" && $(az role definition delete --name $i || true); done diff --git a/aks_clusters.tf b/compute_aks_clusters.tf similarity index 100% rename from aks_clusters.tf rename to compute_aks_clusters.tf diff --git a/availability_sets.tf b/compute_availability_sets.tf similarity index 100% rename from availability_sets.tf rename to compute_availability_sets.tf diff --git a/azure_redhat_openshift.tf b/compute_azure_redhat_openshift.tf similarity index 100% rename from azure_redhat_openshift.tf rename to compute_azure_redhat_openshift.tf diff --git a/batch_accounts.tf b/compute_batch_accounts.tf similarity index 100% rename from batch_accounts.tf rename to compute_batch_accounts.tf diff --git a/batch_applications.tf b/compute_batch_applications.tf similarity index 100% rename from batch_applications.tf rename to compute_batch_applications.tf diff --git a/batch_certificates.tf b/compute_batch_certificates.tf similarity index 100% rename from batch_certificates.tf rename to compute_batch_certificates.tf diff --git a/batch_jobs.tf b/compute_batch_jobs.tf similarity index 100% rename from batch_jobs.tf rename to compute_batch_jobs.tf diff --git a/batch_pools.tf b/compute_batch_pools.tf similarity index 100% rename from batch_pools.tf rename to compute_batch_pools.tf diff --git a/container_groups.tf b/compute_container_groups.tf similarity index 100% rename from container_groups.tf rename to compute_container_groups.tf diff --git a/container_registry.tf b/compute_container_registry.tf similarity index 100% rename from container_registry.tf rename to compute_container_registry.tf diff --git a/dedicated_hosts.tf b/compute_dedicated_hosts.tf similarity index 100% rename from dedicated_hosts.tf rename to compute_dedicated_hosts.tf diff --git a/proximity_placement_groups.tf b/compute_proximity_placement_groups.tf similarity index 100% rename from proximity_placement_groups.tf rename to compute_proximity_placement_groups.tf diff --git a/virtual_machines.tf b/compute_virtual_machines.tf similarity index 100% rename from virtual_machines.tf rename to compute_virtual_machines.tf diff --git a/virtual_machines_extensions.tf b/compute_virtual_machines_extensions.tf similarity index 100% rename from virtual_machines_extensions.tf rename to compute_virtual_machines_extensions.tf diff --git a/virtual_machines_scale_sets.tf b/compute_virtual_machines_scale_sets.tf similarity index 100% rename from virtual_machines_scale_sets.tf rename to compute_virtual_machines_scale_sets.tf diff --git a/virtual_machines_scale_sets_extensions.tf b/compute_virtual_machines_scale_sets_extensions.tf similarity index 100% rename from virtual_machines_scale_sets_extensions.tf rename to compute_virtual_machines_scale_sets_extensions.tf diff --git a/vmware_clusters.tf b/compute_vmware_clusters.tf similarity index 100% rename from vmware_clusters.tf rename to compute_vmware_clusters.tf diff --git a/wvd_application_groups.tf b/compute_wvd_application_groups.tf similarity index 100% rename from wvd_application_groups.tf rename to compute_wvd_application_groups.tf diff --git a/wvd_applications.tf b/compute_wvd_applications.tf similarity index 100% rename from wvd_applications.tf rename to compute_wvd_applications.tf diff --git a/wvd_host_pools.tf b/compute_wvd_host_pools.tf similarity index 100% rename from wvd_host_pools.tf rename to compute_wvd_host_pools.tf diff --git a/wvd_workspaces.tf b/compute_wvd_workspaces.tf similarity index 100% rename from wvd_workspaces.tf rename to compute_wvd_workspaces.tf From 7248cb3155ba7dcf022e1a6d80200bfcda03ad53 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Wed, 26 Jul 2023 02:21:24 +0000 Subject: [PATCH 5/6] Update dedicated host types --- .../dedicated_hosts/101-dedicated-host/configuration.tfvars | 2 +- .../102-dedicated-host-vms/configuration.tfvars | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/compute/dedicated_hosts/101-dedicated-host/configuration.tfvars b/examples/compute/dedicated_hosts/101-dedicated-host/configuration.tfvars index 65adee6786..4adc3c8dff 100644 --- a/examples/compute/dedicated_hosts/101-dedicated-host/configuration.tfvars +++ b/examples/compute/dedicated_hosts/101-dedicated-host/configuration.tfvars @@ -31,7 +31,7 @@ dedicated_hosts = { dedicated_host_group_key = "dhg1" #lz_key = "remote landing zone key" region = "region1" - sku_name = "DSv3-Type1" + sku_name = "DSv3-Type3" platform_fault_domain = 1 auto_replace_on_failure = true # license_type = "Windows_Server_Hybrid" diff --git a/examples/compute/dedicated_hosts/102-dedicated-host-vms/configuration.tfvars b/examples/compute/dedicated_hosts/102-dedicated-host-vms/configuration.tfvars index 2c5bf71cbe..1b2ec59faf 100644 --- a/examples/compute/dedicated_hosts/102-dedicated-host-vms/configuration.tfvars +++ b/examples/compute/dedicated_hosts/102-dedicated-host-vms/configuration.tfvars @@ -30,10 +30,10 @@ dedicated_hosts = { dedicated_host_group_key = "dhg1" #lz_key = "remote landing zone key" region = "region1" - sku_name = "DSv3-Type1" + sku_name = "DSv3-Type3" platform_fault_domain = 1 auto_replace_on_failure = true - # license_type = "Windows_Server_Hybrid" + license_type = "Windows_Server_Hybrid" tags = { test = "dhg" } From 576fc378a9837dafa7432db900c855d2810ff728 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Wed, 26 Jul 2023 03:14:29 +0000 Subject: [PATCH 6/6] Update rover --- .devcontainer/docker-compose.yml | 2 +- .github/workflows/landingzone-scenarios.yaml | 2 +- .github/workflows/rover.yaml | 2 +- .github/workflows/standalone-compute.yaml | 4 ++-- .github/workflows/standalone-networking.yaml | 4 ++-- .github/workflows/standalone-regressor-tf100.yaml | 4 ++-- .github/workflows/standalone-tf100.yaml | 4 ++-- rover_on_ssh_host.yml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 2f243e0065..b3bed9957b 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,7 +6,7 @@ version: '3.7' services: rover: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 user: vscode labels: diff --git a/.github/workflows/landingzone-scenarios.yaml b/.github/workflows/landingzone-scenarios.yaml index b3fc3b4e93..dd785caca2 100644 --- a/.github/workflows/landingzone-scenarios.yaml +++ b/.github/workflows/landingzone-scenarios.yaml @@ -86,7 +86,7 @@ jobs: needs: [job] container: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 options: --user 0 steps: diff --git a/.github/workflows/rover.yaml b/.github/workflows/rover.yaml index 9f45244382..0fe43afeda 100644 --- a/.github/workflows/rover.yaml +++ b/.github/workflows/rover.yaml @@ -46,7 +46,7 @@ jobs: needs: rover_setup container: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 options: --user 0 env: diff --git a/.github/workflows/standalone-compute.yaml b/.github/workflows/standalone-compute.yaml index b9bcf481fd..adb8664e6a 100644 --- a/.github/workflows/standalone-compute.yaml +++ b/.github/workflows/standalone-compute.yaml @@ -46,7 +46,7 @@ jobs: matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}} container: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 options: --user 0 steps: @@ -131,7 +131,7 @@ jobs: needs: [testcases] container: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 options: --user 0 steps: diff --git a/.github/workflows/standalone-networking.yaml b/.github/workflows/standalone-networking.yaml index cb99dcb586..1fda252966 100644 --- a/.github/workflows/standalone-networking.yaml +++ b/.github/workflows/standalone-networking.yaml @@ -46,7 +46,7 @@ jobs: matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}} container: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 options: --user 0 steps: @@ -131,7 +131,7 @@ jobs: needs: [testcases] container: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 options: --user 0 steps: diff --git a/.github/workflows/standalone-regressor-tf100.yaml b/.github/workflows/standalone-regressor-tf100.yaml index 78051c4ca8..891e414d26 100644 --- a/.github/workflows/standalone-regressor-tf100.yaml +++ b/.github/workflows/standalone-regressor-tf100.yaml @@ -58,7 +58,7 @@ jobs: matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}} container: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 options: --user 0 steps: @@ -178,7 +178,7 @@ jobs: needs: [testcases] container: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 options: --user 0 steps: diff --git a/.github/workflows/standalone-tf100.yaml b/.github/workflows/standalone-tf100.yaml index 023804d1f0..494bcc7a09 100644 --- a/.github/workflows/standalone-tf100.yaml +++ b/.github/workflows/standalone-tf100.yaml @@ -55,7 +55,7 @@ jobs: matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}} container: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 options: --user 0 steps: @@ -140,7 +140,7 @@ jobs: needs: [testcases] container: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 options: --user 0 steps: diff --git a/rover_on_ssh_host.yml b/rover_on_ssh_host.yml index 35d3e5562f..8a95920d21 100644 --- a/rover_on_ssh_host.yml +++ b/rover_on_ssh_host.yml @@ -11,7 +11,7 @@ version: '3.7' services: rover: - image: aztfmod/rover:1.5.2-2307.0508 + image: aztfmod/rover:1.5.3-2307.2007 user: vscode