Skip to content

Commit 121153a

Browse files
committed
wip
1 parent e8bcbbc commit 121153a

2 files changed

Lines changed: 11 additions & 27 deletions

File tree

.azuredevops/pipelines/hub-infrastructure-dev.yaml

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@ pr: none
66
pool:
77
name: private-pool-hub-nonlive-uks
88
# vmImage: ubuntu-latest
9-
steps:
10-
- script: |
11-
echo "=== List hosted toolcache ==="
12-
ls -la /opt/hostedtoolcache || true
13-
14-
echo "=== List terraform cache ==="
15-
ls -la /opt/hostedtoolcache/terraform || true
16-
17-
echo "=== Which terraform ==="
18-
which terraform || true
19-
20-
echo "=== Terraform version ==="
21-
terraform version || true
22-
displayName: Inspect Terraform installation
239

2410
resources:
2511
repositories:
@@ -34,7 +20,7 @@ variables:
3420
- name: TF_DIRECTORY
3521
value: $(System.DefaultWorkingDirectory)/$(System.TeamProject)/infrastructure/terraform/hub
3622
- name: TF_VERSION
37-
value: 1.11.4
23+
value: 1.14.3
3824
- name: TF_PLAN_ARTIFACT
3925
value: tf_plan_hub_art_NONLIVE_dev
4026
- name: ENVIRONMENT
@@ -50,17 +36,16 @@ stages:
5036
- job: init_and_plan
5137
displayName: Init, plan, store artifact
5238
steps:
53-
- task: TerraformInstaller@1
54-
displayName: Install Terraform $(TF_VERSION)
55-
inputs:
56-
terraformVersion: $(TF_VERSION)
57-
- task: Bash@3
58-
displayName: 'Set TF_DIRECTORY variable'
59-
inputs:
60-
targetType: 'inline'
61-
script: |
62-
terraform --version
63-
39+
# - task: TerraformInstaller@1
40+
# displayName: Install Terraform $(TF_VERSION)
41+
# inputs:
42+
# terraformVersion: $(TF_VERSION)
43+
# - task: Bash@3
44+
# displayName: 'Set TF_DIRECTORY variable'
45+
# inputs:
46+
# targetType: 'inline'
47+
# script: |
48+
# terraform --version
6449
- checkout: self
6550
- checkout: dtos-devops-templates
6651
- template: .azuredevops/templates/steps/tf_plan.yaml@dtos-devops-templates

infrastructure/bootstrap/hub.bicep

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ module managedIdentiyGHtoADO 'modules/managedIdentity.bicep' = {
217217
}
218218
}
219219

220-
221220
@description('Let the GHtoADO managed identity access a subscription')
222221
resource readerAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
223222
name: guid(subscription().subscriptionId, hubType, 'reader')

0 commit comments

Comments
 (0)