Skip to content

Commit

Permalink
Merge pull request #399 from Azure/int-5.6.0
Browse files Browse the repository at this point in the history
Integration with AZTFMOD CAF module 5.6.6
  • Loading branch information
LaurentLesle committed Mar 22, 2023
2 parents d12bd91 + 75eb19d commit c25f0d0
Show file tree
Hide file tree
Showing 134 changed files with 4,687 additions and 2,337 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
version: '3.7'
services:
rover:
image: aztfmod/rover-preview:1.2.1-2205.300342
image: aztfmod/rover-preview:1.3.9-2303.090804
user: vscode

labels:
Expand Down
40 changes: 30 additions & 10 deletions .github/workflows/landingzones-tf100.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ jobs:
random_length: ['5']

container:
image: aztfmod/rover-preview:1.2.1-2205.300342
image: aztfmod/rover-preview:1.3.9-2303.090804
options: --user 0

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Login azure
run: |
Expand All @@ -52,6 +52,10 @@ jobs:
echo "local user: $(whoami)"
- name: Github Actions permissions workaround
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: launchpad
run: |
/tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_launchpad -a apply \
Expand Down Expand Up @@ -92,17 +96,21 @@ jobs:
]

container:
image: aztfmod/rover-preview:1.2.1-2205.300342
image: aztfmod/rover-preview:1.3.9-2303.090804
options: --user 0

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- 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: Github Actions permissions workaround
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: deploy example
run: |
/tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_solution/ -a apply \
Expand Down Expand Up @@ -135,11 +143,11 @@ jobs:
random_length: ['5']

container:
image: aztfmod/rover-preview:1.2.1-2205.300342
image: aztfmod/rover-preview:1.3.9-2303.090804
options: --user 0

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Login azure
run: |
Expand All @@ -148,6 +156,10 @@ jobs:
echo "local user: $(whoami)"
- name: Github Actions permissions workaround
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: launchpad-200-upgrade
run: |
/tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_launchpad -a apply \
Expand Down Expand Up @@ -186,17 +198,21 @@ jobs:
]

container:
image: aztfmod/rover-preview:1.2.1-2205.300342
image: aztfmod/rover-preview:1.3.9-2303.090804
options: --user 0

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- 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: Github Actions permissions workaround
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: deploy example
run: |
/tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_solution/ -a apply \
Expand Down Expand Up @@ -228,11 +244,11 @@ jobs:
random_length: ['5']

container:
image: aztfmod/rover-preview:1.2.1-2205.300342
image: aztfmod/rover-preview:1.3.9-2303.090804
options: --user 0

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Login azure
run: |
Expand All @@ -241,6 +257,10 @@ jobs:
echo "local user: $(whoami)"
- name: Github Actions permissions workaround
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: foundations
run: |
/tf/rover/rover.sh -lz ${GITHUB_WORKSPACE}/caf_solution -a destroy \
Expand Down
Loading

0 comments on commit c25f0d0

Please sign in to comment.