Skip to content

Commit ca46487

Browse files
jenny-curryjenny-curry
committed
bring in recent changes
2 parents 26c10a0 + 5837017 commit ca46487

File tree

59 files changed

+4375
-770
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+4375
-770
lines changed

‎.github/workflows/ado-migration-process-full.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
name: Full ADO Project Migration
2+
run-name: "${{ github.event.inputs.SourceOrganizationName }}/${{ github.event.inputs.SourceProjectName }}=>${{ github.event.inputs.TargetOrganizationName }}/${{ github.event.inputs.TargetProjectName }} [Full Migration]"
23

34
on:
45
workflow_dispatch:
56
inputs:
67
SourceOrganizationName:
78
description: "Name of the Source Organization"
89
required: true
9-
default: ""
10+
default: "AIZ-GL"
1011
SourceProjectName:
1112
description: "Name of the Source Project"
1213
required: true
13-
default: ""
14+
default: "GL.CL-Elita"
1415
TargetOrganizationName:
1516
description: "Name of the Target Organization"
1617
required: true
17-
default: ""
18+
default: "AIZ-Global"
1819
TargetProjectName:
1920
description: "Name of the Target Project"
2021
required: true
21-
default: ""
22+
default: "GL.CL-Elita-migrated"
2223
WhatIf:
2324
type: boolean
2425
description: "WhatIf: Simulated Run"
@@ -28,7 +29,7 @@ on:
2829
jobs:
2930
run-powershell-script:
3031
name: Run PowerShell Script
31-
runs-on: 'ubuntu-latest'
32+
runs-on: 'AEC0WGEMP001'
3233
timeout-minutes: 7200
3334
env:
3435
AZURE_DEVOPS_MIGRATION_PAT: ${{ secrets.AZURE_DEVOPS_MIGRATION_PAT }}
@@ -44,13 +45,13 @@ jobs:
4445
az --version
4546
4647
- name: Checkout repository
47-
uses: actions/checkout@v3
48+
uses: actions/checkout@v4
4849

49-
- name: Clean Azure DevOps Migration Tools Log and Attachments Directory
50+
- name: Clean Azure DevOps Migration Tools Log Directory
5051
shell: pwsh
5152
run: |
52-
Get-ChildItem "${{ vars.WorkItemMigratorDirectory }}/logs" -Recurse | Remove-Item -Recurse
53-
Get-ChildItem "${{ vars.WorkItemMigratorDirectory }}\\WorkItemAttachmentWorkingFolder" -Recurse | Remove-Item -Recurse
53+
Get-ChildItem "${{ vars.WORKITEMMIGRATORDIRECTORY_V16_0_9 }}/logs" -Recurse | Remove-Item -Recurse
54+
5455
- name: Set Migration Configuration
5556
shell: pwsh
5657
run: |
@@ -70,7 +71,7 @@ jobs:
7071
$configuration.TargetProject.ProjectName = "${{ github.event.inputs.TargetProjectName }}"
7172
$configuration.TargetProject.OrgName = "${{ github.event.inputs.TargetOrganizationName }}"
7273
$configuration.ProjectDirectory = $projectDirectory
73-
$configuration.WorkItemMigratorDirectory = "${{ vars.WorkItemMigratorDirectory }}"
74+
$configuration.WorkItemMigratorDirectory = "${{ vars.WORKITEMMIGRATORDIRECTORY_V16_0_9 }}"
7475
$configuration.RepositoryCloneTempDirectory = "${{ vars.RepositoryCloneTempDirectory }}"
7576
$configuration.DevOpsMigrationToolConfigurationFile = "${{ vars.DevOpsMigrationToolConfigurationFile }}"
7677
$configuration.ArtifactFeedPackageVersionLimit = ${{ vars.ArtifactFeedPackageVersionLimit }}
@@ -88,7 +89,7 @@ jobs:
8889
& ./Step_0_Migrate_Project.ps1 -WhatIf $WhatIf
8990
9091
- name: Archive code coverage results
91-
uses: actions/upload-artifact@v3
92+
uses: actions/upload-artifact@v4
9293
with:
9394
name: migration-run-logs
9495
path: "./Projects"

‎.github/workflows/ado-migration-process-org-users.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66
SourceOrganizationName:
77
description: "Name of the Source Organization"
88
required: true
9-
default: ""
9+
default: "AIZ-GL"
1010
TargetOrganizationName:
1111
description: "Name of the Target Organization"
1212
required: true
13-
default: ""
13+
default: "AIZ-Global"
1414
WhatIf:
1515
type: boolean
1616
description: "WhatIf: Simulated Run"
@@ -21,7 +21,7 @@ on:
2121
jobs:
2222
run-powershell-script:
2323
name: Run PowerShell Script
24-
runs-on: 'ubuntu-latest'
24+
runs-on: 'AEC0WGEMP001'
2525
timeout-minutes: 7200
2626
env:
2727
AZURE_DEVOPS_MIGRATION_PAT: ${{ secrets.AZURE_DEVOPS_MIGRATION_PAT }}
@@ -37,12 +37,12 @@ jobs:
3737
az --version
3838
3939
- name: Checkout repository
40-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
4141

4242
- name: Clean Azure DevOps Migration Tools Log Directory
4343
shell: pwsh
4444
run: |
45-
Get-ChildItem "${{ vars.WorkItemMigratorDirectory }}/logs" -Recurse | Remove-Item -Recurse
45+
Get-ChildItem "${{ var.WORKITEMMIGRATORDIRECTORY_V16_0_9 }}/logs" -Recurse | Remove-Item -Recurse
4646
4747
- name: Set Migration Configuration
4848
shell: pwsh
@@ -63,7 +63,7 @@ jobs:
6363
$configuration.TargetProject.ProjectName = "${{ github.event.inputs.TargetOrganizationName }}"
6464
$configuration.TargetProject.OrgName = "${{ github.event.inputs.TargetOrganizationName }}"
6565
$configuration.ProjectDirectory = $projectDirectory
66-
$configuration.WorkItemMigratorDirectory = "${{ vars.WorkItemMigratorDirectory }}"
66+
$configuration.WorkItemMigratorDirectory = "${{ var.WORKITEMMIGRATORDIRECTORY_V16_0_9 }}"
6767
$configuration.RepositoryCloneTempDirectory = "${{ vars.RepositoryCloneTempDirectory }}"
6868
$configuration.DevOpsMigrationToolConfigurationFile = "${{ vars.DevOpsMigrationToolConfigurationFile }}"
6969
$configuration.ArtifactFeedPackageVersionLimit = ${{ vars.ArtifactFeedPackageVersionLimit }}
@@ -81,14 +81,14 @@ jobs:
8181
& ./Step_X_Migrate_Org_Level_Users.ps1 -WhatIf $WhatIf
8282
8383
- name: Archive DevOps-Enablement-ADO-to-ADO-migration results
84-
uses: actions/upload-artifact@v3
84+
uses: actions/upload-artifact@v4
8585
with:
8686
name: migration-run-logs
8787
path: "./Projects"
8888

8989
- name: Archive Azure DevOps Migration Tools (Martin's Tools) results
90-
uses: actions/upload-artifact@v3
90+
uses: actions/upload-artifact@v4
9191
with:
9292
name: migration-tools-logs
93-
path: "${{ vars.WorkItemMigratorDirectory }}/logs"
93+
path: "${{ var.WORKITEMMIGRATORDIRECTORY_V16_0_9 }}/logs"
9494

‎.github/workflows/ado-migration-process-partial.yml‎

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
name: Partial ADO Project Migration
2+
run-name: "[${{ github.event.inputs.MigrationSelection }}] ${{ github.event.inputs.SourceOrganizationName }}/${{ github.event.inputs.SourceProjectName }}=>${{ github.event.inputs.TargetOrganizationName }}/${{ github.event.inputs.TargetProjectName }}"
23

34
on:
45
workflow_dispatch: # Allows manual triggering via the GitHub Actions UI
56
inputs:
67
SourceOrganizationName:
78
description: "Name of the Source Organization"
89
required: true
9-
default: ""
10+
default: "AIZ-Global"
1011
SourceProjectName:
1112
description: "Name of the Source Project"
1213
required: true
13-
default: ""
14+
default: "GH.Lending-Digital"
1415
TargetOrganizationName:
1516
description: "Name of the Target Organization"
1617
required: true
17-
default: ""
18+
default: "AIZ-SSP"
1819
TargetProjectName:
1920
description: "Name of the Target Project"
2021
required: true
21-
default: ""
22+
default: "GH.AppDev-SSP-Backup-POC-V2"
2223
MigrationSelection:
2324
description: "Migration Selection"
2425
required: true
@@ -28,7 +29,7 @@ on:
2829
- Select an area to migrate
2930
- Areas and Iterations
3031
- Artifacts
31-
- Build Pipelines
32+
- Build Pipelines & Task Groups
3233
- Build Queues & Build Environments
3334
- Dashboards
3435
- Delivery Plans
@@ -38,10 +39,9 @@ on:
3839
- Repositories
3940
- Service Connections
4041
- Service Hooks
41-
- Task Groups
4242
- Teams
4343
- Test Configurations
44-
- Test Plans and Suites
44+
- Test Plans, Suites, and Cases
4545
- Test Variables
4646
- Variable Groups
4747
- Wikis
@@ -56,7 +56,7 @@ on:
5656
jobs:
5757
run-powershell-script:
5858
name: Run PowerShell Script
59-
runs-on: 'ubuntu-latest'
59+
runs-on: 'AEC0WGEMP001'
6060
timeout-minutes: 7200
6161
env:
6262
AZURE_DEVOPS_MIGRATION_PAT: ${{ secrets.AZURE_DEVOPS_MIGRATION_PAT }}
@@ -72,13 +72,12 @@ jobs:
7272
az --version
7373
7474
- name: Checkout repository
75-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
7676

77-
- name: Clean Azure DevOps Migration Tools Log and Attachments Directory
77+
- name: Clean Azure DevOps Migration Tools Log Directory
7878
shell: pwsh
7979
run: |
80-
Get-ChildItem "${{ vars.WorkItemMigratorDirectory }}/logs" -Recurse | Remove-Item -Recurse
81-
Get-ChildItem "${{ vars.WorkItemMigratorDirectory }}\\WorkItemAttachmentWorkingFolder" -Recurse | Remove-Item -Recurse
80+
Get-ChildItem "${{ vars.WORKITEMMIGRATORDIRECTORY_V16_0_9 }}/logs" -Recurse | Remove-Item -Recurse
8281
8382
- name: Set Migration Configuration
8483
shell: pwsh
@@ -99,7 +98,7 @@ jobs:
9998
$configuration.TargetProject.ProjectName = "${{ github.event.inputs.TargetProjectName }}"
10099
$configuration.TargetProject.OrgName = "${{ github.event.inputs.TargetOrganizationName }}"
101100
$configuration.ProjectDirectory = $projectDirectory
102-
$configuration.WorkItemMigratorDirectory = "${{ vars.WorkItemMigratorDirectory }}"
101+
$configuration.WorkItemMigratorDirectory = "${{ vars.WORKITEMMIGRATORDIRECTORY_V16_0_9 }}"
103102
$configuration.RepositoryCloneTempDirectory = "${{ vars.RepositoryCloneTempDirectory }}"
104103
$configuration.DevOpsMigrationToolConfigurationFile = "${{ vars.DevOpsMigrationToolConfigurationFile }}"
105104
$configuration.ArtifactFeedPackageVersionLimit = ${{ vars.ArtifactFeedPackageVersionLimit }}
@@ -124,8 +123,8 @@ jobs:
124123
{ & .\MigrateProject.ps1 -SkipMigrateTfsAreaAndIterations $WhatIf }
125124
"Artifacts"
126125
{ & .\MigrateProject.ps1 -SkipMigrateArtifacts $WhatIf }
127-
"Build Pipelines"
128-
{ & .\MigrateProject.ps1 -SkipMigrateBuildPipelines $WhatIf }
126+
"Build Pipelines & Task Groups"
127+
{ & .\MigrateProject.ps1 -SkipMigrateBuildPipelines $WhatIf }
129128
"Build Queues & Build Environments"
130129
{ & .\MigrateProject.ps1 -SkipMigrateBuildQueues $WhatIf }
131130
"Dashboards"
@@ -135,46 +134,35 @@ jobs:
135134
"Groups"
136135
{ & .\MigrateProject.ps1 -SkipMigrateGroups $WhatIf }
137136
"Policies"
138-
{
139-
& .\helper-scripts\ADODeletePolicies.ps1 -OrgName ${{ github.event.inputs.TargetOrganizationName }} -ProjectName ${{ github.event.inputs.TargetProjectName }} -PAT $env:AZURE_DEVOPS_MIGRATION_PAT -DoDelete (-not $WhatIf)
140-
& .\MigrateProject.ps1 -SkipMigratePolicies $WhatIf
141-
}
137+
{ & .\MigrateProject.ps1 -SkipMigratePolicies $WhatIf }
142138
"Release Pipelines"
143139
{ & .\MigrateProject.ps1 -SkipMigrateReleasePipelines $WhatIf }
144140
"Repositories"
145-
{
146-
& .\helper-scripts\ADODeleteRepos.ps1 -OrgName ${{ github.event.inputs.TargetOrganizationName }} -ProjectName ${{ github.event.inputs.TargetProjectName }} -PAT $env:AZURE_DEVOPS_MIGRATION_PAT -DoDelete (-not $WhatIf)
147-
& .\MigrateProject.ps1 -SkipMigrateRepos $WhatIf
148-
}
141+
{ & .\MigrateProject.ps1 -SkipMigrateRepos $WhatIf }
149142
"Service Connections"
150143
{ & .\MigrateProject.ps1 -SkipMigrateServiceConnections $WhatIf }
151144
"Service Hooks"
152145
{ & .\MigrateProject.ps1 -SkipMigrateServiceHooks $WhatIf }
153-
"Task Groups"
154-
{ & .\MigrateProject.ps1 -SkipMigrateTaskGroups $WhatIf }
155146
"Teams"
156147
{ & .\MigrateProject.ps1 -SkipMigrateTeams $WhatIf }
157148
"Test Configurations"
158149
{ & .\MigrateProject.ps1 -SkipMigrateTestConfigurations $WhatIf }
159-
"Test Plans and Suites"
160-
{ & .\MigrateProject.ps1 -SkipMigrateTestPlansAndSuites $WhatIf }
150+
"Test Plans, Suites, and Cases"
151+
{ & .\MigrateProject.ps1 -SkipMigrateTestPlansAndSuites $WhatIf -SkipMigrateWorkItems $WhatIf -SkipAddReflectedWorkItemIdField $WhatIf -WorkItemQueryBit "SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = @TeamProject AND [System.WorkItemType] IN ('Test Case')"}
161152
"Test Variables"
162153
{ & .\MigrateProject.ps1 -SkipMigrateTestVariables $WhatIf }
163154
"Variable Groups"
164-
{
165-
& .\helper-scripts\ADODeleteVariableGroups.ps1 -OrgName ${{ github.event.inputs.TargetOrganizationName }} -ProjectName ${{ github.event.inputs.TargetProjectName }} -PAT $env:AZURE_DEVOPS_MIGRATION_PAT -DoDelete (-not $WhatIf)
166-
& .\MigrateProject.ps1 -SkipMigrateVariableGroups $WhatIf
167-
}
155+
{ & .\MigrateProject.ps1 -SkipMigrateVariableGroups $WhatIf }
168156
"Wikis"
169157
{ & .\MigrateProject.ps1 -SkipMigrateWikis $WhatIf }
170-
"Work Item Queries"
158+
"Work Item Queries"
171159
{ & .\MigrateProject.ps1 -SkipMigrateWorkItemQuerys $WhatIf }
172160
"Work-Items (Including 'Test Cases')"
173161
{ & .\Step_3_Migrate_Project.ps1 -WhatIf $WhatIf}
174162
}
175163
176164
- name: Archive code coverage results
177-
uses: actions/upload-artifact@v3
165+
uses: actions/upload-artifact@v4
178166
with:
179167
name: migration-run-logs
180168
path: "./Projects"

0 commit comments

Comments
 (0)